amother shuffle and vim buffer motins added
more tidyup and working buffer motion.