Mostly fixed spawning
Actually fixed spawning