small fixes to the demo
WIP