Rebalancing and a bugfix.
Testings.