More fixes to hit points and damage