Some minor changes.
Improved default demo.