Better demo, minor fixes.
Better tests.