Further work on CLM file
Fix up comments and "strings" (really, variables)