fixed wave spawner wave number counting, teaked some npc values