Make things more explicit and fix typos