More bug fixes and rebalances thanks to the community! [sniffle]