Various improvements to doc. Thanks to @akauppi for the feedback.