some fixes + image thumbnails