Commiting final changes to fix typos