revamp keymapping to more sanity