Fix various issues around movie editing and adding