cumulative cleanups, path fixes, relative imports, better string interpolation