Corrections and fix typos