improvements to commenting