small fixes and balancing