fixes to commenting system