More balancing and small bug fix