Add FFMPEG + some fixed