more work on the build system