Bug fix for a number of missing ':' characters, and comment improvements.
Authored by: bugman 2010-12-06
Parent: [r11705]
Child: [r11707]
