bug fixes with EnemyState