Fix of various typos + updates