Update and fix typos