make ffmpeg movie things happy plus cleanups