tightening up and proofing the build code