Some important fixes releated to the future bugs.
The example is more powerful now.