Fix typos, add comments