Fix Canvas
asd
asd
Cleanup