refactoring, bug-fixes, additional thumbnail options.