diff --git a/Makefile b/Makefile
index 947041c..1fb66ed 100755
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,9 @@ OBJDIR = ./obj
 BINDIR = ./bin
 TOOLSDIR = ./tools
 
-LINK_FLAGS = -O1 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmad -lmikmod -lyaml -lc -lm -ldragonsys -lnosys $(LIBS) -Tn64ld.x
+LINK_FLAGS = -O3 -L$(ROOTDIR)/lib -L$(ROOTDIR)/mips64-elf/lib -ldragon -lmad -lmikmod -lyaml -lc -lm -ldragonsys -lnosys $(LIBS) -Tn64ld.x
 PROG_NAME = OS64P
-CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O1 -I$(INCDIR) -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE $(SET_DEBUG)
+CFLAGS = -std=gnu99 -march=vr4300 -mtune=vr4300 -O3 -I$(INCDIR) -I$(ROOTDIR)/include -I$(ROOTDIR)/mips64-elf/include -lpthread -lrt -D_REENTRANT -DUSE_TRUETYPE $(SET_DEBUG)
 ASFLAGS = -mtune=vr4300 -march=vr4300
 CC = $(GCCN64PREFIX)gcc
 AS = $(GCCN64PREFIX)as
diff --git a/docker/setup-linux.sh b/docker/setup-linux.sh
index 439acef..1da6834 100644
--- a/docker/setup-linux.sh
+++ b/docker/setup-linux.sh
@@ -25,7 +25,6 @@ export N64_INST=/usr/local/libdragon
 # Pull the latest libdragon source code and make a build directory
 git clone https://github.com/dragonminded/libdragon.git
 # set to correct commit
-cd libdragon && git checkout b26fce6 && cd ..
 
 # fix issues with the build scripts
 sed -i -- 's|${N64_INST:-/usr/local}|/usr/local/libdragon|g' libdragon/tools/build
@@ -36,11 +35,11 @@ sed -i -- 's| -Werror| -w|g' libdragon/tools/mksprite/Makefile
 
 # make a build folder for libdragon
 mkdir libdragon/build_gcc
-cp libdragon/tools/build libdragon/build_gcc
+cp libdragon/tools/build-toolchain.sh libdragon/build/build-toolchain.sh
 
 # run the build script (this will take a while! and if not sudo, will ask for password mid flow!)
-cd libdragon/build_gcc
-./build
+cd libdragon/build
+./build-toolchain.sh
 
 cd ..
 # run the install script [sudo req]
diff --git a/res/filesystem/sounds/clang.wav b/res/filesystem/sounds/clang.wav
deleted file mode 100644
index e5eca53..0000000
Binary files a/res/filesystem/sounds/clang.wav and /dev/null differ
diff --git a/src/main.c b/src/main.c
index 129e87f..e5f120d 100755
--- a/src/main.c
+++ b/src/main.c
@@ -3243,8 +3243,8 @@ void loadFile(display_context_t disp)
         long long start = 0, end = 0, curr, pause = 0, samples;
         int rate = 44100, last_rate = 44100, channels = 2;
 
-        audio_init(44100, 4);
-        buf_size = audio_get_buffer_length() * 4;
+        audio_init(44100, 8);
+        buf_size = audio_get_buffer_length() * 6;
         buf_ptr = malloc(buf_size);
 
         mp3_Start(name_file, &samples, &rate, &channels);
@@ -3254,9 +3254,10 @@ void loadFile(display_context_t disp)
         while (!(disp = display_lock()))
         ;
         clearScreen(disp);
-        drawShortInfoBox(disp, "    MP3 Playback", 0);
+        drawShortInfoBox(disp, "    Playing MP3", 0);
         display_show(disp);
         input_mapping = mp3; //mp3 stop
+
         break;
     }
     default:
@@ -4127,14 +4128,12 @@ void handleInput(display_context_t disp, sprite_t *contr)
 
                         while (!(disp = display_lock()))
                         ;
-                        new_scroll_pos(&cursor, &page, MAX_LIST, count);
-                        clearScreen(disp); //part clear?
-                        display_dir(list, cursor, page, MAX_LIST, count, disp);
-                        drawBoxNumber(disp, 4);
-                        view_mpk(disp);
-                        display_show(disp);
                         if (sound_on)
-                            playSound(2);
+                          playSound(2);
+
+                        drawBoxNumber(disp, 4);
+                        display_show(disp);
+                        view_mpk(disp);
 
                         input_mapping = abort_screen;
                         break;
@@ -4451,20 +4450,22 @@ void handleInput(display_context_t disp, sprite_t *contr)
         case mp3:
             mp3_Stop();
             mp3playing = 0;
-            //this causes bugs why is it here?
-            //audio_close();
-	        free(buf_ptr);
-	        buf_ptr = 0;
+            audio_close();
+	           free(buf_ptr);
+	         buf_ptr = 0;
+            audio_init(44100, 8);
 
+          while (!(disp = display_lock()))
+              ;
 
-            while (!(disp = display_lock()))
-            ;
-            clearScreen(disp); //part clear?
-            display_dir(list, cursor, page, MAX_LIST, count, disp);
+          graphics_set_color(graphics_make_color(0xFF, 0xFF, 0xFF, 0xFF), graphics_make_color(0x00, 0x00, 0x00, 0x00));
+          new_scroll_pos(&cursor, &page, MAX_LIST, count);
+          clearScreen(disp);
+          display_show(disp);
 
-            display_show(disp);
-
-            input_mapping = file_manager;
+          display_dir(list, cursor, page, MAX_LIST, count, disp);
+          input_mapping = file_manager;
+          display_show(disp);
             break;
 
         default:
@@ -4533,7 +4534,7 @@ int main(void)
         if (sound_on)
         {
             //load soundsystem
-            audio_init(44100, 2);
+            audio_init(44100, 8);
             sndInit();
         }