Fix typos, add more comments