Added HP regen, fixed some combat stuff again