unified canvas and image drawing. Fixes #13