minor balancing & fixing