Add thumbnail_url. Some minor fixes