Fix typos, better comments