update + merge typos