added some modules, change keybindings to vi