fixed the stop painting bug
tested the stop-painting code
fixed conflicts