Fix typos, bring up to date