improve build system even more