fix typos and URI compising issues