Tweak balance, some bug fixes