fixed function names for vim keys movements and swapping windows.