diff --git a/Makefile b/Makefile
index 86183d7eb5..35d61d9549 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ CFLAGS = -Wall -O3 -march=native -std=gnu99
 all: $(TARGET) 
 
 ssnes: $(OBJ)
-	@$(CXX) -o $@ $(OBJ) $(LIBS)
+	@$(CXX) -o $@ $(OBJ) $(LIBS) $(CFLAGS)
 	@echo "LD $@"
 
 %.o: %.c config.h config.mk
diff --git a/config.h b/config.h
index 3a6aa8ff13..3b7a79de04 100644
--- a/config.h
+++ b/config.h
@@ -76,7 +76,7 @@ static const bool force_aspect = true;
 ////////////////////////
 
 // If you change this to something other than FILTER_NONE, make sure that you build the filter module in config.mk.
-#define VIDEO_FILTER FILTER_NONE
+#define VIDEO_FILTER FILTER_NTSC
 
 
 ////////////////
@@ -84,7 +84,7 @@ static const bool force_aspect = true;
 ////////////////
 
 // Will enable audio or not.
-static const bool audio_enable = true;
+static const bool audio_enable = false;
 
 // Output samplerate
 static const unsigned out_rate = 48000; 
diff --git a/config.mk b/config.mk
index 4a8dae50e4..019906f54a 100644
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,6 @@
 
 BUILD_OPENGL = 1
-BUILD_FILTER = 0
+BUILD_FILTER = 1
 
 BUILD_RSOUND = 0
 BUILD_OSS = 0
diff --git a/ssnes.c b/ssnes.c
index 9116f5a8ae..a4c001f207 100644
--- a/ssnes.c
+++ b/ssnes.c
@@ -251,23 +251,23 @@ static void video_frame(const uint16_t *data, unsigned width, unsigned height)
 
 #if VIDEO_FILTER == FILTER_HQ2X
    ProcessHQ2x(output, outputHQ2x);
-   if ( !driver.video->frame(driver.video_data, outputHQ2x, width * 2, height * 2) )
+   if ( !driver.video->frame(driver.video_data, outputHQ2x, width << 1, height << 1, width << 2) )
       video_active = false;
 #elif VIDEO_FILTER == FILTER_HQ4X
    ProcessHQ4x(output, outputHQ4x);
-   if ( !driver.video->frame(driver.video_data, outputHQ4x, width * 4, height * 4) )
+   if ( !driver.video->frame(driver.video_data, outputHQ4x, width << 2, height << 2, width << 3) )
       video_active = false;
 #elif VIDEO_FILTER == FILTER_GRAYSCALE
    grayscale_filter(output, width, height);
-   if ( !driver.video->frame(driver.video_data, output, width, height) )
+   if ( !driver.video->frame(driver.video_data, output, width, height, width << 1) )
       video_active = false;
 #elif VIDEO_FILTER == FILTER_BLEED
    bleed_filter(output, width, height);
-   if ( !driver.video->frame(driver.video_data, output, width, height) )
+   if ( !driver.video->frame(driver.video_data, output, width, height, width << 1) )
       video_active = false;
 #elif VIDEO_FILTER == FILTER_NTSC
    ntsc_filter(output_ntsc, output, width, height);
-   if ( !driver.video->frame(driver.video_data, output_ntsc, SNES_NTSC_OUT_WIDTH(width), height) )
+   if ( !driver.video->frame(driver.video_data, output_ntsc, SNES_NTSC_OUT_WIDTH(width), height, SNES_NTSC_OUT_WIDTH(width) << 1) )
       video_active = false;
 #else
    if ( !driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048) )