added canvas
oog command handling
to master fixes
Merge branch 'jorgen'