Work on comments more