Fixes to docstrings and update to userguide.