DOC:  Fixing documentation and cleaning up tabs and var. names.