Updates to builder comments for all files + build improvements