Balance and small bug fix