inline images, plus a few cleanups