m2v and df2v added, bugs squashed