more improvements to build process
some cleanups