Cleaning up some more combat shit, still need to make sure all of the scenes work properly.