Minor tweaks, doc update