tiny tweaks

Major combat flow redesign, it will take a while.