Tweaks for enemy attacking behaviour
merge conflicts