fixup mappings

* replace the f key mappings (annoying on osx)
* remove unused
remove more garbage
map improvements