Pushed a minor update - mostly just optimization and some rebalancing. Let me know if there are any issues!
