Various fixes, updated demo.json