diff --git a/AUTHORS b/AUTHORS
index 02669660d8..e39f48e17f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,3 +6,7 @@ Devin J. Pohly - <djpohly@djpohly.com>
 
 Chris Moeller - <kode54@gmail.com> 
    - CoreAudio audio driver
+
+Daniel De Matteis - <autechre1024@hotmail.com>
+   - PlayStation 3 port
+
diff --git a/driver.c b/driver.c
index 915553b2dd..f80e83f8c4 100644
--- a/driver.c
+++ b/driver.c
@@ -97,8 +97,6 @@ static const input_driver_t *input_drivers[] = {
 #endif
 };
 
-static int test_counter = 0;
-
 static void find_audio_driver(void)
 {
    for (unsigned i = 0; i < sizeof(audio_drivers) / sizeof(audio_driver_t*); i++)
@@ -109,6 +107,7 @@ static void find_audio_driver(void)
          return;
       }
    }
+   SSNES_ERR("Couldn't find any audio driver named \"%s\"\n", g_settings.audio.driver);
    fprintf(stderr, "Available audio drivers are:\n");
    for (unsigned i = 0; i < sizeof(audio_drivers) / sizeof(audio_driver_t*); i++)
       fprintf(stderr, "\t%s\n", audio_drivers[i]->ident);
diff --git a/ps3/gl_debug.h b/ps3/gl_debug.h
deleted file mode 100644
index 5494746a7d..0000000000
--- a/ps3/gl_debug.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef __DEBUG_H
-#define __DEBUG_H
-
-#include <stdint.h>
-#include <sys/timer.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Inits debug lib
-void init_debug(uint64_t width, uint64_t height); 
-
-void dprintf_console(const char *fmt, ...);
-void dprintf(float x, float y, float scale, const char *fmt, ...);
-
-void uninit_debug(void);
-void write_fps(void);
-void test_performance(void);
-
-#ifdef SSNES_DEBUG
-#define SSNES_LOG(msg, args...) do { \
-   dprintf(0.1f, 0.1f, 1.0f, "SSNES: " msg, ##args); \
-   sys_timer_usleep(300000); \
-   } while(0)
-
-#define SSNES_ERR(msg, args...) do { \
-   dprintf(0.1f, 0.1f, 1.0f, "SSNES [ERROR] :: " msg, ##args); \
-   sys_timer_usleep(300000); \
-   } while(0)
-#else
-#define SSNES_LOG(msg, args...) ((void)0)
-#define SSNES_ERR(msg, args...) ((void)0)
-#endif // SSNES_DEBUG
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __DEBUG_H
diff --git a/ps3/ps3_video_psgl.c b/ps3/ps3_video_psgl.c
index 0f4cca1eaa..13892b7139 100644
--- a/ps3/ps3_video_psgl.c
+++ b/ps3/ps3_video_psgl.c
@@ -840,14 +840,14 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
    gl->tex_index = (gl->tex_index + 1) & TEXTURES_MASK;
 #endif
 
-   if(msg)
+   if (msg)
    {
-      cellDbgFontPrintf (0.09f, 0.90f, 1.51f, BLUE,	msg);
-      cellDbgFontPrintf (0.09f, 0.90f, 1.50f, WHITE,	msg);
+      cellDbgFontPrintf(0.09f, 0.90f, 1.51f, BLUE,	msg);
+      cellDbgFontPrintf(0.09f, 0.90f, 1.50f, WHITE, msg);
       cellDbgFontDraw();
    }
-   psglSwap();
 
+   psglSwap();
    return true;
 }
 
@@ -964,14 +964,14 @@ void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdata)
 	}
 }
 
-static void psgl_init_dbgfont(gl_t * gl)
+static void psgl_init_dbgfont(gl_t *gl)
 {
-	CellDbgFontConfig cfg;
-	memset(&cfg, 0, sizeof(cfg));
-	cfg.bufSize = 512;
-	cfg.screenWidth = gl->win_width;
-	cfg.screenHeight = gl->win_height;
-	cellDbgFontInit(&cfg);
+   CellDbgFontConfig cfg;
+   memset(&cfg, 0, sizeof(cfg));
+   cfg.bufSize = 512;
+   cfg.screenWidth = gl->win_width;
+   cfg.screenHeight = gl->win_height;
+   cellDbgFontInit(&cfg);
 }
 
 static void *gl_init(const video_info_t *video, const input_driver_t **input, void **input_data)