More incremental work, also fixed two missing images (I think).