Revert topo name, cleanup and ctrl-c work

The last three commits have brought instancing into an unstable world.  Reverting for now even though I want them there.