use new C-x map
get rid of some C-c bindings
compact-ish-er key definition so keys can be moved easily