diff --git a/pcsx2/Sio.cpp b/pcsx2/Sio.cpp
index c2b2c124e..333ba5d85 100644
--- a/pcsx2/Sio.cpp
+++ b/pcsx2/Sio.cpp
@@ -572,7 +572,7 @@ void InitializeSIO(u8 value)
 					}
 					sio.bufcount = 3;
 					sio.buf[0] = 0xFF;
-					sio.buf[1] = 0x80;
+					sio.buf[1] = 0x80; // Have no idea if this is correct.  From PSX mtap.
 					sio.buf[2] = 0x5A;
 					sio2.packet.recvVal1 = 0x1100; // Mtap is connected :)
 					break;
@@ -585,7 +585,7 @@ void InitializeSIO(u8 value)
 					}
 					sio.bufcount = 3;
 					sio.buf[0] = 0xFF;
-					sio.buf[1] = 0x80;
+					sio.buf[1] = 0x80; // Have no idea if this is correct.  From PSX mtap.
 					sio.buf[2] = 0x5A;
 					sio2.packet.recvVal1 = 0x1100; // Mtap is connected :)
 					break;
diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp
index 2b956fefd..2aa289c00 100644
--- a/plugins/LilyPad/Config.cpp
+++ b/plugins/LilyPad/Config.cpp
@@ -1444,7 +1444,7 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
 					}
 				}
 			}
-			else if ((cmd >= ID_GUITAR_HERO && cmd <= ID_ANALOG) || cmd == ID_IGNORE) {// || cmd == ID_FORCE_FEEDBACK) {
+			else if ((cmd >= ID_LOCK_BUTTONS && cmd <= ID_ANALOG) || cmd == ID_IGNORE) {// || cmd == ID_FORCE_FEEDBACK) {
 				// Messes up things, unfortunately.
 				// End binding on a bunch of notification messages, and
 				// this will send a bunch.
@@ -1474,10 +1474,6 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
 				Sleep(40);
 				dm->Update(&info);
 				dm->PostRead();
-				int w2 = timeGetTime();
-				if (dm->devices[0xe]->oldVirtualControlState[6] != 0x8000) {
-					dm->devices[0xe]->oldVirtualControlState[6]=dm->devices[0xe]->oldVirtualControlState[6];
-				}
 				SetTimer(hWnd, 1, 30, 0);
 			}
 			if (cmd == IDC_TURBO) {
@@ -1528,7 +1524,7 @@ void UpdatePadPages() {
 			psp.dwSize = sizeof(psp);
 			psp.dwFlags = PSP_USETITLE | PSP_PREMATURE;
 			psp.hInstance = hInst;
-			psp.pfnDlgProc = (DLGPROC) DialogProc;
+			psp.pfnDlgProc = DialogProc;
 			psp.lParam = port | (slot<<1);
 			psp.pszTitle = title;
 			if (config.padConfigs[port][slot].type != GuitarPad)
@@ -1547,20 +1543,6 @@ void UpdatePadPages() {
 	}
 }
 
-INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM lParam);
-
-HPROPSHEETPAGE CreateGeneralPage() {
-	PROPSHEETPAGE psp;
-	ZeroMemory(&psp, sizeof(psp));
-	psp.dwSize = sizeof(psp);
-	psp.dwFlags = PSP_USETITLE | PSP_PREMATURE;
-	psp.hInstance = hInst;
-	psp.pfnDlgProc = (DLGPROC) GeneralDialogProc;
-	psp.pszTitle = L"General";
-	psp.pszTemplate = MAKEINTRESOURCE(IDD_GENERAL);
-	return CreatePropertySheetPage(&psp);
-}
-
 int ListIndexToPortAndSlot (int index, int *port, int *slot) {
 	if (index < 0 || index >= 2 + 3*(config.multitap[0]+config.multitap[1])) {
 		*port = 0;
@@ -1579,6 +1561,9 @@ int ListIndexToPortAndSlot (int index, int *port, int *slot) {
 }
 
 void UpdatePadList(HWND hWnd) {
+	static u8 recurse = 0;
+	if (recurse) return;
+	recurse = 1;
 	HWND hWndList = GetDlgItem(hWnd, IDC_PAD_LIST);
 	HWND hWndCombo = GetDlgItem(hWnd, IDC_PAD_TYPE);
 	HWND hWndAnalog = GetDlgItem(hWnd, IDC_ANALOG_START1);
@@ -1641,6 +1626,8 @@ void UpdatePadList(HWND hWnd) {
 	}
 	EnableWindow(hWndCombo, enable);
 	EnableWindow(hWndAnalog, enable);
+	//ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_DOUBLEBUFFER|LVS_EX_ONECLICKACTIVATE, LVS_EX_DOUBLEBUFFER|LVS_EX_ONECLICKACTIVATE);
+	recurse = 0;
 }
 
 INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM lParam) {
@@ -1651,7 +1638,6 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L
 		{
 			HWND hWndCombo = GetDlgItem(hWnd, IDC_PAD_TYPE);
 			if (SendMessage(hWndCombo, CB_GETCOUNT, 0, 0) == 0) {
-				ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_DOUBLEBUFFER, LVS_EX_DOUBLEBUFFER);
 				LVCOLUMN c;
 				c.mask = LVCF_TEXT | LVCF_WIDTH;
 				c.cx = 50;
@@ -1664,6 +1650,7 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L
 				c.pszText = L"Bindings";
 				ListView_InsertColumn(hWndList, 2, &c);
 				selected = 0;
+				ListView_SetExtendedListViewStyleEx(hWndList, LVS_EX_FULLROWSELECT|LVS_EX_DOUBLEBUFFER, LVS_EX_FULLROWSELECT|LVS_EX_DOUBLEBUFFER);
 				SendMessage(hWndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
 				SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM) L"Disabled");
 				SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM) L"Dualshock 2");
@@ -1850,9 +1837,58 @@ INT_PTR CALLBACK GeneralDialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, L
 				Diagnostics(hWnd);
 			}
 			else if (n->hdr.idFrom == IDC_PAD_LIST) {
-				if (n->hdr.code == NM_CLICK) {
+				if (n->hdr.code == LVN_ITEMCHANGED) {
 					UpdatePadList(hWnd);
 				}
+				if (n->hdr.code == NM_RCLICK) {
+					UpdatePadList(hWnd);
+					int index = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED);
+					int port1, slot1, port2, slot2;
+					if (!ListIndexToPortAndSlot(index, &port1, &slot1)) break;
+					//HMENU hMenu = CreateMenu();
+					HMENU hMenu = CreatePopupMenu();
+					if (!hMenu) break;
+					for (port2=1; port2>=0; port2--) {
+						for (slot2 = 3; slot2>=0; slot2--) {
+							if (port2 == port1 && slot2 == slot1) continue;
+							wchar_t text[100];
+							if (!slot2)
+								wsprintf(text, L"Swap with Pad %i", port2+1);
+							else {
+								if (!config.multitap[port2]) continue;
+								wsprintf(text, L"Swap with Pad %i-%i", port2+1, slot2+1);
+							}
+							MENUITEMINFOW info;
+							memset(&info, 0, sizeof(info));
+							info.cbSize = sizeof(info);
+							info.fMask = MIIM_STRING | MIIM_ID;
+							info.wID = 0x10000 + port2+2*slot2;
+							info.dwTypeData = text;
+							info.cch = wcslen(text);
+							InsertMenuItemW(hMenu, 0, 1, &info);
+						}
+					}
+					POINT pos;
+					GetCursorPos(&pos);
+					int res = TrackPopupMenuEx(hMenu, TPM_NONOTIFY|TPM_RETURNCMD, pos.x, pos.y, hWndProp, 0);
+					DestroyMenu(hMenu);
+					if (res > 0) {
+						slot2 = res - 0x10000;
+						port2 = slot2&1;
+						slot2 >>= 1;
+						PadConfig padCfgTemp = config.padConfigs[port1][slot1];
+						config.padConfigs[port1][slot1] = config.padConfigs[port2][slot2];
+						config.padConfigs[port2][slot2] = padCfgTemp;
+						for (int i=0; i<dm->numDevices; i++) {
+							PadBindings bindings = dm->devices[i]->pads[port1][slot1];
+							dm->devices[i]->pads[port1][slot1] = dm->devices[i]->pads[port2][slot2];
+							dm->devices[i]->pads[port2][slot2] = bindings;
+						}
+						UpdatePadPages();
+						UpdatePadList(hWnd);
+						PropSheet_Changed(hWndProp, hWnd);
+					}
+				}
 			}
 		}
 		break;
@@ -1872,8 +1908,15 @@ void CALLBACK PADconfigure() {
 	LoadSettings();
 	memset(hWnds, 0, sizeof(hWnds));
 
-	HPROPSHEETPAGE page;
-	page = CreateGeneralPage();
+	PROPSHEETPAGE psp;
+	ZeroMemory(&psp, sizeof(psp));
+	psp.dwSize = sizeof(psp);
+	psp.dwFlags = PSP_USETITLE | PSP_PREMATURE;
+	psp.hInstance = hInst;
+	psp.pfnDlgProc = GeneralDialogProc;
+	psp.pszTitle = L"General";
+	psp.pszTemplate = MAKEINTRESOURCE(IDD_GENERAL);
+	HPROPSHEETPAGE page = CreatePropertySheetPage(&psp);
 	if (!page) return;
 
 	PROPSHEETHEADER psh;
diff --git a/plugins/LilyPad/DirectInput.cpp b/plugins/LilyPad/DirectInput.cpp
index 5f0f38815..4c7951a1f 100644
--- a/plugins/LilyPad/DirectInput.cpp
+++ b/plugins/LilyPad/DirectInput.cpp
@@ -50,9 +50,6 @@ void ReleaseDirectInput() {
 			di8d.lpDI8 = 0;
 		}
 	}
-	else {
-		di8d.refCount=di8d.refCount;
-	}
 }
 
 static int StringToGUID(GUID *pg, wchar_t *dataw) {
diff --git a/plugins/LilyPad/InputManager.h b/plugins/LilyPad/InputManager.h
index a5f0587e1..ac9bf8dc6 100644
--- a/plugins/LilyPad/InputManager.h
+++ b/plugins/LilyPad/InputManager.h
@@ -109,7 +109,7 @@ enum DeviceType {
 	NO_DEVICE = 0,
 	KEYBOARD =	1,
 	MOUSE =		2,
-	OTHER =	3
+	OTHER =		3
 };
 
 enum EffectType {
diff --git a/plugins/LilyPad/resource.h b/plugins/LilyPad/resource.h
index de3c4b491..0fba1fbb3 100644
--- a/plugins/LilyPad/resource.h
+++ b/plugins/LilyPad/resource.h
@@ -55,7 +55,6 @@
 #define IDC_DPAD                        0x1008
 #define IDC_LSTICK                      0x1009
 #define IDC_RSTICK                      0x100A
-#define ID_GUITAR_HERO                  0x10FB
 #define ID_LOCK_BUTTONS                 0x10FC
 #define ID_LOCK                         0x10FD
 #define ID_LOCK_DIRECTION               0x10FE