Misc. cleanup and start checking in bits of dorian systest.