Remap some stuff to make it more usable