master [fixes to sprite canvas and other stuff]