diff --git a/doc/examples/suisse-id-demo.cxx b/doc/examples/suisse-id-demo.cxx
index 9eeb41b..014b51e 100644
--- a/doc/examples/suisse-id-demo.cxx
+++ b/doc/examples/suisse-id-demo.cxx
@@ -17,11 +17,7 @@ int main(int argc, char** argv) try {
   mrw::args::parse(argc, argv,
                    "Sign a text (optionally several times for performance"
                    " measurements).",
-                   mrw::args::list()
-                   <<mrw::args::decl("h", "help", "show help",
-                                     mrw::args::decl::param_list()
-                                     <<mrw::args::help()
-                                     <<mrw::args::exit())
+                   mrw::args::defaults()
                    <<mrw::args::decl("l", "library", "cryptoki lirary to load",
                                      mrw::args::decl::param_list()
                                      <<mrw::args::param(lib, "lib")));
diff --git a/src/cryptoki.hxx b/src/cryptoki.hxx
index 89f6e10..e59ed67 100644
--- a/src/cryptoki.hxx
+++ b/src/cryptoki.hxx
@@ -624,7 +624,7 @@ namespace cryptoki {
   /*! @addtogroup cryptokilib */
   //@{
 
-  //! to be instanciated before first use
+  /// Load Cryptoki Library for use with Smart Card.
   class Library {
 
     public:
@@ -768,7 +768,7 @@ namespace cryptoki {
       mrw::Shared<Init> _init;
       
   };
-      
+
   //! Slot and Token Management
   class Slot {
     private: