More Images, plus a few cleanups & fixes.