more cleanups, also fixed thumbnail parsing