Comments and structural fixes for canvaswrapper