more fixes to commenting.