Fix an alignment bug.
Simplify the demo a bit