Added some more info and fix typos