fix a few more corner-cases
add a bunch of images!