<C-A>a for swapping, small other tweak I forget.. look at the diff -_-.