Doc review; fix some quirks.