Text edits.
Cleanups.
Bug fix in tabs.
Bug fix.
Merge branch 'master' into gh-pages