More WaveGenerator and GameEngine