Further work and polishing for the comments system.