Fixed success conditions and enemy respawn problems