Fixes to spawn behaviour - (well more to catching bad behaviour)
It needs a redo - but patched so it doesn't die horribly.