Add some images, various fixes