some fixes and balancing