Code-cleanup, improvements to qdoc's, correction to qdoc macros used for...

... code snippets and new screenshots