Improved snippets, improved std::demo, code revision