Balancing, bug fixes