Update to spawn with level design and a little wave fix