demo

+ fixes
+ demo script