Minor tweaks and documentation