Bug & balance fixes