diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index 244c57acfd..9c87cf4988 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -1,7 +1,6 @@
 //TODO hook up newer file ID stuff, think about how to combine it with the disc ID
 //TODO change display manager to not require 0xFF alpha channel set on videoproviders. check gdi+ and opengl! this will get us a speedup in some places
 //TODO Disc.Structure.Sessions[0].length_aba was 0
-//TODO disc lights
 
 using System;
 using System.Runtime.InteropServices;
@@ -215,7 +214,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 			//  VirtualHeight = 240;
 			//}
 			//BUT-for now theyre normalized (NOTE: THIS MESSES UP THE ASPECT RATIOS)
-			VirtualWidth = 700;
+			VirtualWidth = 800;
 			VirtualHeight = 480;
 
 
diff --git a/output/dll/octoshock.dll b/output/dll/octoshock.dll
index a18d029c1b..5fe5439298 100644
Binary files a/output/dll/octoshock.dll and b/output/dll/octoshock.dll differ
diff --git a/psx/octoshock/psx/frontio.cpp b/psx/octoshock/psx/frontio.cpp
index aa3e69d36e..a6c71a236f 100644
--- a/psx/octoshock/psx/frontio.cpp
+++ b/psx/octoshock/psx/frontio.cpp
@@ -750,28 +750,28 @@ void FrontIO::SetInput(unsigned int port, const char *type, void *ptr)
   irq10_pulse_ts[port] = PSX_EVENT_MAXTS;
 
  //DAW
- //if(!strcmp(type, "gamepad") || !strcmp(type, "dancepad"))
+ if(!strcmp(type, "gamepad") || !strcmp(type, "dancepad"))
   Devices[port] = Device_Gamepad_Create();
- //else if(!strcmp(type, "dualanalog"))
- // Devices[port] = Device_DualAnalog_Create(false);
- //else if(!strcmp(type, "analogjoy"))
- // Devices[port] = Device_DualAnalog_Create(true);
- //else if(!strcmp(type, "dualshock"))
- //{
- // char name[256];
- // trio_snprintf(name, 256, _("DualShock on port %u"), port + 1);
- // Devices[port] = Device_DualShock_Create(std::string(name));
- //}
- //else if(!strcmp(type, "mouse"))
- // Devices[port] = Device_Mouse_Create();
- //else if(!strcmp(type, "negcon"))
- // Devices[port] = Device_neGcon_Create();
- //else if(!strcmp(type, "guncon"))
- // Devices[port] = Device_GunCon_Create();
- //else if(!strcmp(type, "justifier"))
- // Devices[port] = Device_Justifier_Create();
- //else
- // Devices[port] = new InputDevice();
+ else if(!strcmp(type, "dualanalog"))
+  Devices[port] = Device_DualAnalog_Create(false);
+ else if(!strcmp(type, "analogjoy"))
+  Devices[port] = Device_DualAnalog_Create(true);
+ else if(!strcmp(type, "dualshock"))
+ {
+  char name[256];
+  snprintf(name, 256, "DualShock on port %u", port + 1);
+  Devices[port] = Device_DualShock_Create(std::string(name));
+ }
+ else if(!strcmp(type, "mouse"))
+  Devices[port] = Device_Mouse_Create();
+ else if(!strcmp(type, "negcon"))
+  Devices[port] = Device_neGcon_Create();
+ else if(!strcmp(type, "guncon"))
+  Devices[port] = Device_GunCon_Create();
+ else if(!strcmp(type, "justifier"))
+  Devices[port] = Device_Justifier_Create();
+ else
+  Devices[port] = new InputDevice();
 
  //Devices[port]->SetCrosshairsColor(chair_colors[port]);
  DeviceData[port] = ptr;
diff --git a/psx/octoshock/psx/psx.cpp b/psx/octoshock/psx/psx.cpp
index 3b53173714..4abe1f7ecb 100644
--- a/psx/octoshock/psx/psx.cpp
+++ b/psx/octoshock/psx/psx.cpp
@@ -960,27 +960,6 @@ static void PSX_Power(void)
 {
  PSX_PRNG.ResetState();	// Should occur first!
 
-#if 0
- const uint32 counterer = 262144;
- uint64 averageizer = 0;
- uint32 maximizer = 0;
- uint32 minimizer = ~0U;
- for(int i = 0; i < counterer; i++)
- {
-  uint32 tmp = PSX_GetRandU32(0, 20000);
-  if(tmp < minimizer)
-   minimizer = tmp;
-
-  if(tmp > maximizer)
-   maximizer = tmp;
-
-  averageizer += tmp;
-  printf("%8u\n", tmp);
- }
- printf("Average: %f\nMinimum: %u\nMaximum: %u\n", (double)averageizer / counterer, minimizer, maximizer);
- exit(1);
-#endif
-
  memset(MainRAM.data32, 0, 2048 * 1024);
 
  for(unsigned i = 0; i < 9; i++)
@@ -1395,10 +1374,10 @@ struct {
 			buf[0] = (buttons>>0)&0xFF;
 			buf[1] = (buttons>>8)&0xFF;
 			buf[2] = (buttons>>16)&0xFF; //this is only the analog mode button
-			buf[3] = left_x;
-			buf[4] = left_y;
 			buf[3] = right_x;
 			buf[4] = right_y;
+			buf[5] = left_x;
+			buf[6] = left_y;
 			break;
 		}
 	}
@@ -1485,7 +1464,8 @@ EW_EXPORT s32 shock_Create(void** psx, s32 region, void* firmware512k)
 	s_ShockConfig.lcm_width = givp.lcm_width;
 	s_ShockConfig.lcm_height = givp.lcm_height;
 	s_ShockConfig.fb_height = givp.fb_height;
-	s_ShockConfig.fb_width = givp.fb_width;
+	//s_ShockConfig.fb_width = givp.fb_width;
+	s_ShockConfig.fb_width = 800; //we're a bit sloppy right now.. use this to make sure theres adequate room for double-sizing a 400px wide screen
 	s_ShockConfig.fb_height = givp.fb_height;
 	s_ShockConfig.nominal_width = givp.nominal_width;
 	s_ShockConfig.nominal_height = givp.nominal_height;
@@ -1684,7 +1664,7 @@ void NormalizeFramebuffer()
 	if(width == 400 && height == 480) xs=2;
 	if(width == 560 && height == 480) {}
 	if(width == 700 && height == 480) {}
-	xm = (700-width*xs)/2;
+	xm = (800-width*xs)/2;
 
 	int curr = 0;
 
@@ -1716,7 +1696,7 @@ void NormalizeFramebuffer()
 
 	//2. double the width as needed. but always float it.
 	//note, theres nothing to be done here if the framebuffer is already wide enough
-	if(width != 700)
+	if(width != 800)
 	{
 		uint32* src = VTBuffer[curr]->pixels + (s_ShockConfig.fb_width*espec.DisplayRect.y) + espec.DisplayRect.x;
 		uint32* dst = VTBuffer[curr^1]->pixels;
@@ -1749,7 +1729,7 @@ void NormalizeFramebuffer()
 		}
 
 		//patch up the metrics
-		width = 700; //we floated the content horizontally, so this becomes the new width
+		width = 800; //we floated the content horizontally, so this becomes the new width
 		espec.DisplayRect.x = 0;
 		espec.DisplayRect.y = 0;
 		VTLineWidths[curr^1][0] = width;
diff --git a/psx/octoshock/test/miniclient/miniclient.cpp b/psx/octoshock/test/miniclient/miniclient.cpp
index 3a16228292..2c2b3bb3ab 100644
--- a/psx/octoshock/test/miniclient/miniclient.cpp
+++ b/psx/octoshock/test/miniclient/miniclient.cpp
@@ -310,6 +310,7 @@ int main(int argc, char **argv)
 	shock_OpenTray(psx);
 	shock_SetDisc(psx,bin.disc);
 	shock_CloseTray(psx);
+	shock_Peripheral_Connect(psx,0x01,ePeripheralType_DualShock);
 	shock_PowerOn(psx);
 
 	int framectr = 0;