A number of small enhancements to boilerplate/_cgcc