Beginning tidying up combat rules.