improvements to spawner