more strict commenting
scripted update of code from master at 658a800 more strict commenting