Making some progres getting stuff to work.
Yet more minor tweaks.