missed some funcs; tweaked keymaps