Comments Mgr tweaks