cleanups
port more variables; frob more pathnames