Fixing the canvas size + some more improvements.