Bug and balance fixes