New Enemy type, small fixes