fixed up the build system a little