fix horrid merge bug (yay!). Implement suspend/resume events for redrawing, to speed...