Balancing & minor fixes