Some cleanup and changing to larger images