Bunch of improvements to spawn