Fix up some Sphinx references
Some work towards a 'clone' method. meh.