Did some extra work on the canvas renderer