Movie Support and Fixes

Fixes issues with RMA'd units and adds movie support