combat stuff

hopefully this doesn't break any one else's stuff