Update commentary and fix some typos