diff --git a/Makefile b/Makefile
deleted file mode 100644
index 087932e..0000000
--- a/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include Makefile.libretro
diff --git a/core/vdp_ctrl.c b/core/vdp_ctrl.c
index a6d8832..ce8b1a1 100644
--- a/core/vdp_ctrl.c
+++ b/core/vdp_ctrl.c
@@ -6,7 +6,6 @@
  *
  *  Copyright (C) 1998-2003  Charles Mac Donald (original code)
  *  Copyright (C) 2007-2016  Eke-Eke (Genesis Plus GX)
- *  Copyright (C) 2016       Michael Lelli (Emscripten changes)
  *
  *  Redistribution and use of this code or any derivative works are permitted
  *  provided that the following conditions are met:
diff --git a/core/vdp_render.c b/core/vdp_render.c
index 6781823..c9493b3 100644
--- a/core/vdp_render.c
+++ b/core/vdp_render.c
@@ -6,7 +6,6 @@
  *
  *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003  Charles Mac Donald (original code)
  *  Copyright (C) 2007-2016  Eke-Eke (Genesis Plus GX)
- *  Copyright (C) 2016       Michael Lelli (Emscripten changes)
  *
  *  Redistribution and use of this code or any derivative works are permitted
  *  provided that the following conditions are met:
diff --git a/libretro/libretro.c b/libretro/libretro.c
index 86cca13..73819fd 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -1146,7 +1146,7 @@ static void check_variables(void)
   var.key = "genesis_plus_gx_gun_cursor";
   environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
   {
-    if (strcmp(var.value, "no") == 0)
+    if (strcmp(var.value, "disabled") == 0)
       config.gun_cursor = 0;
     else
       config.gun_cursor = 1;
@@ -1155,7 +1155,7 @@ static void check_variables(void)
   var.key = "genesis_plus_gx_invert_mouse";
   environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
   {
-    if (strcmp(var.value, "no") == 0)
+    if (strcmp(var.value, "disabled") == 0)
       config.invert_mouse = 0;
     else
       config.invert_mouse = 1;
@@ -1535,8 +1535,8 @@ void retro_set_environment(retro_environment_t cb)
       { "genesis_plus_gx_gg_extra", "Game Gear extended screen; disabled|enabled" },
       { "genesis_plus_gx_aspect_ratio", "Core-provided aspect ratio; auto|NTSC PAR|PAL PAR" },
       { "genesis_plus_gx_render", "Interlaced mode 2 output; single field|double field" },
-      { "genesis_plus_gx_gun_cursor", "Show Lightgun crosshair; no|yes" },
-      { "genesis_plus_gx_invert_mouse", "Invert Mouse Y-axis; no|yes" },
+      { "genesis_plus_gx_gun_cursor", "Show Lightgun crosshair; disabled|enabled" },
+      { "genesis_plus_gx_invert_mouse", "Invert Mouse Y-axis; disabled|enabled" },
       { NULL, NULL },
    };