Updated documentation

and other minor tweaks