Fixing TYPOS galore