fix typos, and some issues