Whole bunch of edits and new images