diff --git a/polymer/build/src/glbuild.c b/polymer/build/src/glbuild.c
index 8e14b0866..fa61aa4bf 100644
--- a/polymer/build/src/glbuild.c
+++ b/polymer/build/src/glbuild.c
@@ -138,7 +138,7 @@ int loadgldriver(const char *driver)
  #ifdef _WIN32
         driver = "OPENGL32.DLL";
 #elif defined __APPLE__
-        driver = "OpenGLLibrary";
+		driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
 #else
         driver = "libGL.so";
 #endif
diff --git a/polymer/eduke32/MakeDistributions b/polymer/eduke32/MakeDistributions
index 9ab06fc93..f5e023608 100644
--- a/polymer/eduke32/MakeDistributions
+++ b/polymer/eduke32/MakeDistributions
@@ -38,7 +38,7 @@ source:
 
 binary:
 	make RELEASE=1
-	upx mapster32.exe eduke32.exe duke3d_w32.exe setup.exe
+#	upx -9 mapster32.exe eduke32.exe duke3d_w32.exe setup.exe
 	rm -rf $(binarydir)
 	mkdir $(binarydir)
 #	mkdir $(binarydir) $(binarydir)/models
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 80d19ff4d..34a3b0bc8 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -8563,16 +8563,9 @@ void Startup(void)
 {
     int i;
 
-    // why the fuck aren't these part of CONFIG_ReadSetup()?
-
-    //    CONFIG_SetupMouse();
-    //    CONFIG_SetupJoystick();
-
-    //    CONFIG_WriteSetup();
-
     compilecons();
 
-    CONFIG_ReadSetup();
+    CONFIG_ReadKeys(); // we re-read the keys after compiling the CONs
 
     if (initengine()) {
         wm_msgbox("Build Engine Initialisation Error",
diff --git a/polymer/eduke32/source/jfaud_sounds.cpp b/polymer/eduke32/source/jfaud_sounds.cpp
index f5bf972f8..b73297115 100644
--- a/polymer/eduke32/source/jfaud_sounds.cpp
+++ b/polymer/eduke32/source/jfaud_sounds.cpp
@@ -136,12 +136,21 @@ static float translatepitch(int p)
 	return t;
 }
 
-typedef struct {
+class SoundChannel {
+public:
 	JFAudMixerChannel *chan;
 	int owner;	// sprite number
 	int soundnum;	// sound number
 	bool done;
-} SoundChannel;
+	
+	SoundChannel()
+	{
+		chan = NULL;
+		owner = -1;
+		soundnum = -1;
+		done = false;
+	}
+};
 
 static SoundChannel *chans = NULL;
 static JFAud *jfaud = NULL;
@@ -152,9 +161,6 @@ static bool havemidi = false, havewave = false;
 static void stopcallback(int r)
 {
 	chans[r].done = true;
-//	jfaud->FreeSound(chans[r].chan);
-//	chans[r].chan = NULL;
-//	chans[r].owner = -1;
 }
 
 void testcallback(unsigned long num)