fixed few bugs in combat