Small updates to the manual spawner. Not done yet