Modified some more battle stuff