* fixes to stupid mistakes in CanvasToPixel
* cleanup