More IC2 fixes, preliminary keybind work