major battle bug fixes