Marie is a saint and fixed the canvas bugs
Fixed merge conflicts