Player can no longer hit enemies if dead etc.

Other tweaks and bugfix