Fix minor bugs and add small improvements
Fix minor bugs and add small improvements

nerdzeu/NERDZCrush,MediaCrush/MediaCrush,MediaCrush/MediaCrush,roderickm/MediaCrush,roderickm/MediaCrush,roderickm/MediaCrush,nerdzeu/NERDZCrush,nerdzeu/NERDZCrush