typos and more comments