FIXME's from feedback 1,2, and me, plus some wording/typo fixes