Further balalancing and small changes