improved build
even more improvements for the build