Minor tweaks and update documentation