Added mp4 support
Tweaks