Remove thumbnails and some corrections