fixed one nullptr, fixme'd another, and update Move to record the actual
route taken for extensibility with a GUI.