more progress towards fixing the build system