Comments mostly working