Enemy and other improvements