Updating the docs.
Argument cleanup and documentation tweak.
Merge branch 'master' into gh-pages