way to integrate comments into the generated output - various simplificatins and cleanups throughout R=r OCL=20062 CL=20062