Improve WaveController & wave spawning in general