Combat system and minor things