Add comments, fix typos