Changed some keymaps
changed some modules