Everything but canvas-draw brought up to latest