More typos and omissions