Changes to Character.java battle and more