Change some keybindings, reorganize, fix supertab completion