Brett's fix wasnt working, using my fix instead.
Removed scrub, wasnt working on windows. (something about the ffmpeg key option string)

-- removing some leftover comments