battle stuff

some cleaning up and goofing off