more slight cleanups  to the build system; WiP