Cut some of the image size down, and additional clean-up