prevent generate:thumbnails from thumbnailing thumbnails
misc bug fixes