Add some debug, do a little cleanup - still don't have singleton comm_spawn working. Sigh.