Some minor cleaning up.
Updated the user documentation.