DOCS-3167 - improvements and lots of bug fixes