Fixed a few Combat Bugs