fix typos and a few tweaks