merged in ryan's spawner controller edits, added some previous edits