Add some more draw hooks, fix /keybind