Improve behavior when image changes pile up

Fixes/improves #147.
Coincidentally fixes/improves #119! :smiley: