Added rudimentary battle and several minor fixes