last changes before deciding to drop jointJS-ish