Further BUILDENV refinement, further fool-proofing of Makefiles and