Documentation tweaks, mostly based on Ondrej's comments