more changes and fix typos