Not done debugging. But updated demo, and (almost) functional other stuff