New strategy in the demo
Corrections in the help string of the CLI interface
Trying to optimize the whole thing (??)