NEXUS-7671: Applied comments and some doco