Various fixes/improvements
Updated dist/demo