Added vlc2.1 and fixed up some batch errors.