more image cleanup/adding, less changes