Add some other functions and binding from prelude
Add swap-window binding