updated demo, some minor fixes