fixes for combat system