some changes
Bunch of restructuring and adding of keymaps for various modes
more mappings