Documentation update and cleanups
Bugfix