Fixed fighting bugs
Cosmetic fix
Merge pull request #274 from jcadek/master

Bug fixes for fighting