fix typos & some refinements