comments system and minor mods