fix typos and more comments