Some balancing and minor changes/fixes