couple of mods to comments