Cleaned up and enhanced fighting a little