Misc Bug fixes.
Updating docs.
Updating docs.