Comments working quite well now