Fixed some images, and some cleanup