Fixes and add optional thumbnail