Balancing and further bugfixes