Combat stuff, mostly untested
Minor typo in untested combat stuff