Lots of Canvas Bug Fixes