Further balancing and other tweaks