Assorted balance and bug fix