markOldPaint bugfix
A few more bugfixes