Doc: jpeach suggested tweaks and amc tweaks.