Final fix for thumbnail problems.
Some crash fixes and shortcut fixes