fixed the build system, as per comments