Fix of typos and errors