changed around some things in the build system