Fix bugs with scribbling and updating