initial cutover
ready for watabou
fix :VFMOpts escaping; watabou fixes
renamed commands; fixed VFMOpts