I repaired the code that was mangled by the merge conflict.

The sketch demo does work - it was a bit slow in reacting, but I can only draw lines, not rectangles etc. it seems.