lchen59 paulkim6 : small bug fixes in battle