diff --git a/src/input.c b/src/input.c
index 32307eb..68d01af 100644
--- a/src/input.c
+++ b/src/input.c
@@ -74,13 +74,13 @@ void input_setDefault(void) {
   input_setKeybind("target_hostile",  KEYBIND_KEYBOARD, SDLK_r,           KMOD_NONE,  0);
   /* Combat. */
   input_setKeybind("primary",         KEYBIND_KEYBOARD, SDLK_SPACE,       KMOD_NONE,  0);
-  input_setKeybind("face",            KEYBIND_KEYBOARD, SDLK_1,           KMOD_NONE,  0);
+  input_setKeybind("face",            KEYBIND_KEYBOARD, SDLK_f,           KMOD_NONE,  0);
   input_setKeybind("board",           KEYBIND_KEYBOARD, SDLK_b,           KMOD_NONE,  0);
   /* Escorts. */
-  input_setKeybind("e_attack",        KEYBIND_KEYBOARD, SDLK_f,           KMOD_NONE,  0);
-  input_setKeybind("e_hold",          KEYBIND_KEYBOARD, SDLK_g,           KMOD_NONE,  0);
-  input_setKeybind("e_return",        KEYBIND_KEYBOARD, SDLK_r,           KMOD_NONE,  0);
-  input_setKeybind("e_clear",         KEYBIND_KEYBOARD, SDLK_c,           KMOD_NONE,  0);
+  input_setKeybind("e_attack",        KEYBIND_KEYBOARD, SDLK_1,           KMOD_NONE,  0);
+  input_setKeybind("e_hold",          KEYBIND_KEYBOARD, SDLK_2,           KMOD_NONE,  0);
+  input_setKeybind("e_return",        KEYBIND_KEYBOARD, SDLK_3,           KMOD_NONE,  0);
+  input_setKeybind("e_clear",         KEYBIND_KEYBOARD, SDLK_4,           KMOD_NONE,  0);
 
 
   /* Secondary weapon. */
diff --git a/src/lephisto.c b/src/lephisto.c
index 8daff3c..014ea41 100644
--- a/src/lephisto.c
+++ b/src/lephisto.c
@@ -236,7 +236,6 @@ int main(int argc, char** argv) {
   player_cleanup(); /* Cleans up the player stuff. */
   gui_free();       /* Free up the gui. */
   weapon_exit();    /* Destroy all active weapons. */
-  space_exit();     /* Clean up the universe!!! */
   pilots_free();    /* Free the pilots, they where locked up D: */
   space_exit();     /* Cleans up the universe itself. */