more work on canvas support