add tweaks and fix typos