Balance updates and some fixes