more battle stuff

implementing more battle stuff