Updates to commenting features

See email for details.