diff --git a/src/drivers/win/ramwatch.cpp b/src/drivers/win/ramwatch.cpp
index 07ca0d32..1d2bcf01 100644
--- a/src/drivers/win/ramwatch.cpp
+++ b/src/drivers/win/ramwatch.cpp
@@ -1,1212 +1,1230 @@
-
-#include <windows.h>
-#include "common.h"
-#include "main.h"
-using namespace std;
-
-#include "resource.h"
-#include "ram_search.h"
-#include "ramwatch.h"
-#include "cheat.h"
-#include <assert.h>
-#include <windows.h>
-#include <commctrl.h>
-#include <string>
-
-/*
-#include <commctrl.h>
-#pragma comment(lib, "comctl32.lib")
-#include <shellapi.h>
-#pragma comment(lib, "shell32.lib")
-#include <commdlg.h>
-#pragma comment(lib, "comdlg32.lib")
-*/
-
-static HMENU ramwatchmenu;
-static HMENU rwrecentmenu;
-/*static*/ HACCEL RamWatchAccels = NULL;
-char rw_recent_files[MAX_RECENT_WATCHES][1024] = {"","","","",""};
-//char Watch_Dir[1024]="";
-bool RWfileChanged = false; //Keeps track of whether the current watch file has been changed, if so, ramwatch will prompt to save changes
-bool AutoRWLoad = false;    //Keeps track of whether Auto-load is checked
-bool RWSaveWindowPos = false; //Keeps track of whether Save Window position is checked
-char currentWatch[1024];
-int ramw_x, ramw_y;			//Used to store ramwatch dialog window positions
-AddressWatcher rswatches[MAX_WATCH_COUNT];
-int WatchCount=0;
-
-char applicationPath[2048];
-struct InitRamWatch
-{
-	InitRamWatch()
-	{
-		GetModuleFileName(NULL, applicationPath, 2048);
-	}
-} initRamWatch;
-
-HWND RamWatchHWnd;
-#define gamefilename GetRomName()
-#define hWnd hAppWnd
-#define hInst fceu_hInstance
-static char Str_Tmp [1024];
-
-void init_list_box(HWND Box, const char* Strs[], int numColumns, int *columnWidths); //initializes the ram search and/or ram watch listbox
-
-#define MESSAGEBOXPARENT (RamWatchHWnd ? RamWatchHWnd : hWnd)
-
-bool QuickSaveWatches();
-bool ResetWatches();
-
-void RefreshWatchListSelectedCountControlStatus(HWND hDlg);
-
-unsigned int GetCurrentValue(AddressWatcher& watch)
-{
-	//TODO: A similar if for 4-byte just to be through, but there shouldn't be any reason to have 4-byte on the NES!
-	if (watch.Size == 'w')	//Do little endian
-	{
-		unsigned int x = ReadValueAtHardwareAddress(watch.Address+1, 1) * 256;
-		x += ReadValueAtHardwareAddress(watch.Address, 1);
-		return x;
-	}
-	else
-		return ReadValueAtHardwareAddress(watch.Address, watch.Size == 'd' ? 4 : watch.Size == 'w' ? 2 : 1);
-}
-
-bool IsSameWatch(const AddressWatcher& l, const AddressWatcher& r)
-{
-	if (r.Size == 'S') return false;
-	return ((l.Address == r.Address) && (l.Size == r.Size) && (l.Type == r.Type)/* && (l.WrongEndian == r.WrongEndian)*/);
-}
-
-bool VerifyWatchNotAlreadyAdded(const AddressWatcher& watch)
-{
-	for (int j = 0; j < WatchCount; j++)
-	{
-		if (IsSameWatch(rswatches[j], watch))
-		{
-			if(RamWatchHWnd)
-				SetForegroundWindow(RamWatchHWnd);
-			return false;
-		}
-	}
-	return true;
-}
-
-
-bool InsertWatch(const AddressWatcher& Watch, char *Comment)
-{
-	if(!VerifyWatchNotAlreadyAdded(Watch))
-		return false;
-
-	if(WatchCount >= MAX_WATCH_COUNT)
-		return false;
-
-	int i = WatchCount++;
-	AddressWatcher& NewWatch = rswatches[i];
-	NewWatch = Watch;
-	//if (NewWatch.comment) free(NewWatch.comment);
-	NewWatch.comment = (char *) malloc(strlen(Comment)+2);
-	NewWatch.CurValue = GetCurrentValue(NewWatch);
-	strcpy(NewWatch.comment, Comment);
-	ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
-	RWfileChanged=true;
-
-	return true;
-}
-
-LRESULT CALLBACK PromptWatchNameProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) //Gets the description of a watched address
-{
-	RECT r;
-	RECT r2;
-	int dx1, dy1, dx2, dy2;
-
-	switch(uMsg)
-	{
-		case WM_INITDIALOG:
-			//Clear_Sound_Buffer();
-
-			GetWindowRect(hWnd, &r);
-			dx1 = (r.right - r.left) / 2;
-			dy1 = (r.bottom - r.top) / 2;
-
-			GetWindowRect(hDlg, &r2);
-			dx2 = (r2.right - r2.left) / 2;
-			dy2 = (r2.bottom - r2.top) / 2;
-
-			//SetWindowPos(hDlg, NULL, max(0, r.left + (dx1 - dx2)), max(0, r.top + (dy1 - dy2)), NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
-			SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
-			strcpy(Str_Tmp,"Enter a name for this RAM address.");
-			SendDlgItemMessage(hDlg,IDC_PROMPT_TEXT,WM_SETTEXT,0,(LPARAM)Str_Tmp);
-			strcpy(Str_Tmp,"");
-			SendDlgItemMessage(hDlg,IDC_PROMPT_TEXT2,WM_SETTEXT,0,(LPARAM)Str_Tmp);
-			return true;
-			break;
-
-		case WM_COMMAND:
-			switch(LOWORD(wParam))
-			{
-				case IDOK:
-				{
-					GetDlgItemText(hDlg,IDC_PROMPT_EDIT,Str_Tmp,80);
-					InsertWatch(rswatches[WatchCount],Str_Tmp);
-					EndDialog(hDlg, true);
-					return true;
-					break;
-				}
-				case IDCANCEL:
-					EndDialog(hDlg, false);
-					return false;
-					break;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hDlg, false);
-			return false;
-			break;
-	}
-
-	return false;
-}
-
-bool InsertWatch(const AddressWatcher& Watch, HWND parent)
-{
-	if(!VerifyWatchNotAlreadyAdded(Watch))
-		return false;
-
-	if(!parent)
-		parent = RamWatchHWnd;
-	if(!parent)
-		parent = hWnd;
-
-	int prevWatchCount = WatchCount;
-
-	rswatches[WatchCount] = Watch;
-	rswatches[WatchCount].CurValue = GetCurrentValue(rswatches[WatchCount]);
-	DialogBox(hInst, MAKEINTRESOURCE(IDD_PROMPT), parent, (DLGPROC) PromptWatchNameProc);
-
-	return WatchCount > prevWatchCount;
-}
-
-void Update_RAM_Watch()
-{
-	BOOL watchChanged[MAX_WATCH_COUNT] = {0};
-
-	if(WatchCount)
-	{
-		// update cached values and detect changes to displayed listview items
-
-		for(int i = 0; i < WatchCount; i++)
-		{
-			unsigned int prevCurValue = rswatches[i].CurValue;
-			unsigned int newCurValue = GetCurrentValue(rswatches[i]);
-			if(prevCurValue != newCurValue)
-			{
-				rswatches[i].CurValue = newCurValue;
-				watchChanged[i] = TRUE;
-			}
-		}
-	}
-
-	// refresh any visible parts of the listview box that changed
-	HWND lv = GetDlgItem(RamWatchHWnd,IDC_WATCHLIST);
-	int top = ListView_GetTopIndex(lv);
-	int bottom = top + ListView_GetCountPerPage(lv) + 1; // +1 is so we will update a partially-displayed last item
-	if(top < 0) top = 0;
-	if(bottom > WatchCount) bottom = WatchCount;
-	int start = -1;
-	for(int i = top; i <= bottom; i++)
-	{
-		if(start == -1)
-		{
-			if(i != bottom && watchChanged[i])
-			{
-				start = i;
-				//somethingChanged = true;
-			}
-		}
-		else
-		{
-			if(i == bottom || !watchChanged[i])
-			{
-				ListView_RedrawItems(lv, start, i-1);
-				start = -1;
-			}
-		}
-	}
-}
-
-bool AskSave()
-{
-	//This function asks to save changes if the watch file contents have changed
-	//returns false only if a save was attempted but failed or was cancelled
-	if (RWfileChanged)
-	{
-		int answer = MessageBox(MESSAGEBOXPARENT, "Save Changes?", "Ram Watch", MB_YESNOCANCEL);
-		if(answer == IDYES)
-			if(!QuickSaveWatches())
-				return false;
-		return (answer != IDCANCEL);
-	}
-	return true;
-}
-
-void WriteRecentRWFiles()
-{
-	char str[2048];
-	for (int i = 0; i < MAX_RECENT_WATCHES; i++)
-	{
-		sprintf(str, "recentWatch%d", i+1);
-		//regSetStringValue(str, &rw_recent_files[i][0]); TODO
-	}
-}
-
-void UpdateRW_RMenu(HMENU menu, unsigned int mitem, unsigned int baseid)
-{
-	MENUITEMINFO moo;
-	int x;
-
-	moo.cbSize = sizeof(moo);
-	moo.fMask = MIIM_SUBMENU | MIIM_STATE;
-
-	GetMenuItemInfo(GetSubMenu(ramwatchmenu, 0), mitem, FALSE, &moo);
-	moo.hSubMenu = menu;
-	moo.fState = strlen(rw_recent_files[0]) ? MFS_ENABLED : MFS_GRAYED;
-
-	SetMenuItemInfo(GetSubMenu(ramwatchmenu, 0), mitem, FALSE, &moo);
-
-	// Remove all recent files submenus
-	for(x = 0; x < MAX_RECENT_WATCHES; x++)
-	{
-		RemoveMenu(menu, baseid + x, MF_BYCOMMAND);
-	}
-
-	// Recreate the menus
-	for(x = MAX_RECENT_WATCHES - 1; x >= 0; x--)
-	{  
-		char tmp[128 + 5];
-
-		// Skip empty strings
-		if(!strlen(rw_recent_files[x]))
-		{
-			continue;
-		}
-
-		moo.cbSize = sizeof(moo);
-		moo.fMask = MIIM_DATA | MIIM_ID | MIIM_TYPE;
-
-		// Fill in the menu text.
-		if(strlen(rw_recent_files[x]) < 128)
-		{
-			sprintf(tmp, "&%d. %s", ( x + 1 ) % 10, rw_recent_files[x]);
-		}
-		else
-		{
-			sprintf(tmp, "&%d. %s", ( x + 1 ) % 10, rw_recent_files[x] + strlen( rw_recent_files[x] ) - 127);
-		}
-
-		// Insert the menu item
-		moo.cch = strlen(tmp);
-		moo.fType = 0;
-		moo.wID = baseid + x;
-		moo.dwTypeData = tmp;
-		InsertMenuItem(menu, 0, 1, &moo);
-	}
-
-	// I don't think one function shall do so many things in a row
-//	WriteRecentRWFiles();	// write recent menu to ini
-}
-
-void UpdateRWRecentArray(const char* addString, unsigned int arrayLen, HMENU menu, unsigned int menuItem, unsigned int baseId)
-{
-	const size_t len = 1024; // Avoid magic numbers
-
-	// Try to find out if the filename is already in the recent files list.
-	for(unsigned int x = 0; x < arrayLen; x++)
-	{
-		if(strlen(rw_recent_files[x]))
-		{
-			if(!strncmp(rw_recent_files[x], addString, 1024))    // Item is already in list.
-			{
-				// If the filename is in the file list don't add it again.
-				// Move it up in the list instead.
-
-				int y;
-				char tmp[len];
-
-				// Save pointer.
-				strncpy(tmp, rw_recent_files[x], len);
-				
-				for(y = x; y; y--)
-				{
-					// Move items down.
-					strncpy(rw_recent_files[y],rw_recent_files[y - 1], len);
-				}
-
-				// Put item on top.
-				strncpy(rw_recent_files[0],tmp, len);
-
-				// Update the recent files menu
-				UpdateRW_RMenu(menu, menuItem, baseId);
-
-				return;
-			}
-		}
-	}
-
-	// The filename wasn't found in the list. That means we need to add it.
-
-	// Move the other items down.
-	for(unsigned int x = arrayLen - 1; x; x--)
-	{
-		strncpy(rw_recent_files[x],rw_recent_files[x - 1], len);
-	}
-
-	// Add the new item.
-	strncpy(rw_recent_files[0], addString, len);
-
-	// Update the recent files menu
-	UpdateRW_RMenu(menu, menuItem, baseId);
-}
-
-void RWAddRecentFile(const char *filename)
-{
-	UpdateRWRecentArray(filename, MAX_RECENT_WATCHES, rwrecentmenu, RAMMENU_FILE_RECENT, RW_MENU_FIRST_RECENT_FILE);
-}
-
-void OpenRWRecentFile(int memwRFileNumber)
-{
-	if(!ResetWatches())
-		return;
-
-	int rnum = memwRFileNumber;
-	if ((unsigned int)rnum >= MAX_RECENT_WATCHES)
-		return; //just in case
-
-	char* x;
-
-	while(true)
-	{
-		x = rw_recent_files[rnum];
-		if (!*x) 
-			return;		//If no recent files exist just return.  Useful for Load last file on startup (or if something goes screwy)
-
-		if (rnum) //Change order of recent files if not most recent
-		{
-			RWAddRecentFile(x);
-			rnum = 0;
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	strcpy(currentWatch,x);
-	strcpy(Str_Tmp,currentWatch);
-
-	//loadwatches here
-	FILE *WatchFile = fopen(Str_Tmp,"rb");
-	if (!WatchFile)
-	{
-		int answer = MessageBox(MESSAGEBOXPARENT,"Error opening file.","ERROR",MB_OKCANCEL);
-		if (answer == IDOK)
-		{
-			rw_recent_files[rnum][0] = '\0';	//Clear file from list 
-			if (rnum)							//Update the ramwatch list
-				RWAddRecentFile(rw_recent_files[0]); 
-			else
-				RWAddRecentFile(rw_recent_files[1]);
-		}
-		return;
-	}
-	const char DELIM = '\t';
-	AddressWatcher Temp;
-	char mode;
-	fgets(Str_Tmp,1024,WatchFile);
-	sscanf(Str_Tmp,"%c%*s",&mode);
-	//if ((mode == '1' && !(SegaCD_Started)) || (mode == '2' && !(_32X_Started)))
-	//{
-	//	char Device[8];
-	//	strcpy(Device,(mode > '1')?"32X":"SegaCD");
-	//	sprintf(Str_Tmp,"Warning: %s not started. \nWatches for %s addresses will be ignored.",Device,Device);
-	//	MessageBox(MESSAGEBOXPARENT,Str_Tmp,"Possible Device Mismatch",MB_OK);
-	//}
-	int WatchAdd;
-	fgets(Str_Tmp,1024,WatchFile);
-	sscanf(Str_Tmp,"%d%*s",&WatchAdd);
-	WatchAdd+=WatchCount;
-	for (int i = WatchCount; i < WatchAdd; i++)
-	{
-		while (i < 0)
-			i++;
-		do {
-			fgets(Str_Tmp,1024,WatchFile);
-		} while (Str_Tmp[0] == '\n');
-		sscanf(Str_Tmp,"%*05X%*c%04X%*c%c%*c%c%*c%d",&(Temp.Address),&(Temp.Size),&(Temp.Type),&(Temp.WrongEndian));
-		Temp.WrongEndian = 0;
-		char *Comment = strrchr(Str_Tmp,DELIM) + 1;
-		*strrchr(Comment,'\n') = '\0';
-		InsertWatch(Temp,Comment);
-	}
-
-	fclose(WatchFile);
-	if (RamWatchHWnd) {
-		ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
-		RefreshWatchListSelectedCountControlStatus(RamWatchHWnd);
-	}
-	RWfileChanged=false;
-	return;
-}
-
-int Change_File_L(char *Dest, char *Dir, char *Titre, char *Filter, char *Ext, HWND hwnd)
-{
-	OPENFILENAME ofn;
-
-	SetCurrentDirectory(applicationPath);
-
-	if (!strcmp(Dest, ""))
-	{
-		strcpy(Dest, "default.");
-		strcat(Dest, Ext);
-	}
-
-	memset(&ofn, 0, sizeof(OPENFILENAME));
-
-	ofn.lStructSize = sizeof(OPENFILENAME);
-	ofn.hwndOwner = hwnd;
-	ofn.hInstance = hInst;
-	ofn.lpstrFile = Dest;
-	ofn.nMaxFile = 2047;
-	ofn.lpstrFilter = Filter;
-	ofn.nFilterIndex = 1;
-	ofn.lpstrInitialDir = Dir;
-	ofn.lpstrTitle = Titre;
-	ofn.lpstrDefExt = Ext;
-	ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
-
-	if (GetOpenFileName(&ofn)) return 1;
-
-	return 0;
-}
-
-int Change_File_S(char *Dest, char *Dir, char *Titre, char *Filter, char *Ext, HWND hwnd)
-{
-	OPENFILENAME ofn;
-
-	SetCurrentDirectory(applicationPath);
-
-	if (!strcmp(Dest, ""))
-	{
-		strcpy(Dest, "default.");
-		strcat(Dest, Ext);
-	}
-
-	memset(&ofn, 0, sizeof(OPENFILENAME));
-
-	ofn.lStructSize = sizeof(OPENFILENAME);
-	ofn.hwndOwner = hwnd;
-	ofn.hInstance = hInst;
-	ofn.lpstrFile = Dest;
-	ofn.nMaxFile = 2047;
-	ofn.lpstrFilter = Filter;
-	ofn.nFilterIndex = 1;
-	ofn.lpstrInitialDir = Dir;
-	ofn.lpstrTitle = Titre;
-	ofn.lpstrDefExt = Ext;
-	ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
-
-	if (GetSaveFileName(&ofn)) {
-		return 1;
-	}
-
-	return 0;
-}
-
-bool Save_Watches()
-{
-	const char* slash = max(strrchr(gamefilename, '|'), max(strrchr(gamefilename, '\\'), strrchr(gamefilename, '/')));
-	strcpy(Str_Tmp,slash ? slash+1 : gamefilename);
-	char* dot = strrchr(Str_Tmp, '.');
-	if(dot) *dot = 0;
-	if(Change_File_S(Str_Tmp, applicationPath, "Save Watches", "Watchlist (*.wch)\0*.wch\0All Files (*.*)\0*.*\0\0", "wch", RamWatchHWnd))
-	{
-		FILE *WatchFile = fopen(Str_Tmp,"r+b");
-		if (!WatchFile) WatchFile = fopen(Str_Tmp,"w+b");
-		fputc('\n',WatchFile);
-		strcpy(currentWatch,Str_Tmp);
-		RWAddRecentFile(currentWatch);
-		sprintf(Str_Tmp,"%d\n",WatchCount);
-		fputs(Str_Tmp,WatchFile);
-		const char DELIM = '\t';
-		for (int i = 0; i < WatchCount; i++)
-		{
-			sprintf(Str_Tmp,"%05X%c%04X%c%c%c%c%c%d%c%s\n",i,DELIM,rswatches[i].Address,DELIM,rswatches[i].Size,DELIM,rswatches[i].Type,DELIM,rswatches[i].WrongEndian,DELIM,rswatches[i].comment);
-			fputs(Str_Tmp,WatchFile);
-		}
-		
-		fclose(WatchFile);
-		RWfileChanged=false;
-		//TODO: Add to recent list function call here
-		return true;
-	}
-	return false;
-}
-
-bool QuickSaveWatches()
-{
-if (RWfileChanged==false) return true; //If file has not changed, no need to save changes
-if (currentWatch[0] == NULL) //If there is no currently loaded file, run to Save as and then return
-	{
-		return Save_Watches();
-	}
-		
-		strcpy(Str_Tmp,currentWatch);
-		FILE *WatchFile = fopen(Str_Tmp,"r+b");
-		if (!WatchFile) WatchFile = fopen(Str_Tmp,"w+b");
-		fputc('\n',WatchFile);
-		sprintf(Str_Tmp,"%d\n",WatchCount);
-		fputs(Str_Tmp,WatchFile);
-		const char DELIM = '\t';
-		for (int i = 0; i < WatchCount; i++)
-		{
-			sprintf(Str_Tmp,"%05X%c%04X%c%c%c%c%c%d%c%s\n",i,DELIM,rswatches[i].Address,DELIM,rswatches[i].Size,DELIM,rswatches[i].Type,DELIM,rswatches[i].WrongEndian,DELIM,rswatches[i].comment);
-			fputs(Str_Tmp,WatchFile);
-		}
-		fclose(WatchFile);
-		RWfileChanged=false;
-		return true;
-}
-
-bool Load_Watches(bool clear, const char* filename)
-{
-	const char DELIM = '\t';
-	FILE* WatchFile = fopen(filename,"rb");
-	if (!WatchFile)
-	{
-		MessageBox(MESSAGEBOXPARENT,"Error opening file.","ERROR",MB_OK);
-		return false;
-	}
-	if(clear)
-	{
-		if(!ResetWatches())
-		{
-			fclose(WatchFile);
-			return false;
-		}
-	}
-	strcpy(currentWatch,filename);
-	RWAddRecentFile(currentWatch);
-	AddressWatcher Temp;
-	char mode;
-	fgets(Str_Tmp,1024,WatchFile);
-	sscanf(Str_Tmp,"%c%*s",&mode);
-	int WatchAdd;
-	fgets(Str_Tmp,1024,WatchFile);
-	sscanf(Str_Tmp,"%d%*s",&WatchAdd);
-	WatchAdd+=WatchCount;
-	for (int i = WatchCount; i < WatchAdd; i++)
-	{
-		while (i < 0)
-			i++;
-		do {
-			fgets(Str_Tmp,1024,WatchFile);
-		} while (Str_Tmp[0] == '\n');
-		sscanf(Str_Tmp,"%*05X%*c%04X%*c%c%*c%c%*c%d",&(Temp.Address),&(Temp.Size),&(Temp.Type),&(Temp.WrongEndian));
-		Temp.WrongEndian = 0;
-		char *Comment = strrchr(Str_Tmp,DELIM) + 1;
-		*strrchr(Comment,'\n') = '\0';
-		InsertWatch(Temp,Comment);
-	}
-	
-	fclose(WatchFile);
-	if (RamWatchHWnd)
-		ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
-	RWfileChanged=false;
-	return true;
-}
-
-bool Load_Watches(bool clear)
-{
-	const char* slash = max(strrchr(gamefilename, '|'), max(strrchr(gamefilename, '\\'), strrchr(gamefilename, '/')));
-	strcpy(Str_Tmp,slash ? slash+1 : gamefilename);
-	char* dot = strrchr(Str_Tmp, '.');
-	if(dot) *dot = 0;
-	strcat(Str_Tmp,".wch");
-	if(Change_File_L(Str_Tmp, applicationPath, "Load Watches", "Watchlist (*.wch)\0*.wch\0All Files (*.*)\0*.*\0\0", "wch", RamWatchHWnd))
-	{
-		return Load_Watches(clear, Str_Tmp);
-	}
-	return false;
-}
-
-bool ResetWatches()
-{
-	if(!AskSave())
-		return false;
-	for (;WatchCount>=0;WatchCount--)
-	{
-		free(rswatches[WatchCount].comment);
-		rswatches[WatchCount].comment = NULL;
-	}
-	WatchCount++;
-	if (RamWatchHWnd) {
-		ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
-		RefreshWatchListSelectedCountControlStatus(RamWatchHWnd);
-	}
-	RWfileChanged = false;
-	currentWatch[0] = NULL;
-	return true;
-}
-
-void RemoveWatch(int watchIndex)
-{
-	free(rswatches[watchIndex].comment);
-	rswatches[watchIndex].comment = NULL;
-	for (int i = watchIndex; i <= WatchCount; i++)
-		rswatches[i] = rswatches[i+1];
-	WatchCount--;
-}
-
-void RefreshWatchListSelectedItemControlStatus(HWND hDlg)
-{
-	static int prevSelIndex=-1;
-	int selIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_RAMLIST));
-	if(selIndex != prevSelIndex)
-	{
-		if(selIndex == -1 || prevSelIndex == -1)
-		{
-			EnableWindow(GetDlgItem(hDlg, IDC_C_ADDCHEAT), (selIndex != -1) ? TRUE : FALSE);
-		}
-		prevSelIndex = selIndex;
-	}
-}
-
-LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) //Gets info for a RAM Watch, and then inserts it into the Watch List
-{
-	RECT r;
-	RECT r2;
-	int dx1, dy1, dx2, dy2;
-	static int index;
-	static char s,t = s = 0;
-
-	switch(uMsg)
-	{
-		case WM_INITDIALOG:
-			//Clear_Sound_Buffer();
-			
-
-			GetWindowRect(hWnd, &r);
-			dx1 = (r.right - r.left) / 2;
-			dy1 = (r.bottom - r.top) / 2;
-
-			GetWindowRect(hDlg, &r2);
-			dx2 = (r2.right - r2.left) / 2;
-			dy2 = (r2.bottom - r2.top) / 2;
-
-			//SetWindowPos(hDlg, NULL, max(0, r.left + (dx1 - dx2)), max(0, r.top + (dy1 - dy2)), NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
-			SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
-			index = (int)lParam;
-			sprintf(Str_Tmp,"%04X",rswatches[index].Address);
-			SetDlgItemText(hDlg,IDC_EDIT_COMPAREADDRESS,Str_Tmp);
-			if (rswatches[index].comment != NULL)
-				SetDlgItemText(hDlg,IDC_PROMPT_EDIT,rswatches[index].comment);
-			s = rswatches[index].Size;
-			t = rswatches[index].Type;
-			switch (s)
-			{
-				case 'b':
-					SendDlgItemMessage(hDlg, IDC_1_BYTE, BM_SETCHECK, BST_CHECKED, 0);
-					break;
-				case 'w':
-					SendDlgItemMessage(hDlg, IDC_2_BYTES, BM_SETCHECK, BST_CHECKED, 0);
-					break;
-				case 'd':
-					SendDlgItemMessage(hDlg, IDC_4_BYTES, BM_SETCHECK, BST_CHECKED, 0);
-					break;
-				default:
-					s = 0;
-					break;
-			}
-			switch (t)
-			{
-				case 's':
-					SendDlgItemMessage(hDlg, IDC_SIGNED, BM_SETCHECK, BST_CHECKED, 0);
-					break;
-				case 'u':
-					SendDlgItemMessage(hDlg, IDC_UNSIGNED, BM_SETCHECK, BST_CHECKED, 0);
-					break;
-				case 'h':
-					SendDlgItemMessage(hDlg, IDC_HEX, BM_SETCHECK, BST_CHECKED, 0);
-					break;
-				default:
-					t = 0;
-					break;
-			}
-
-			return true;
-			break;
-		
-		case WM_COMMAND:
-			switch(LOWORD(wParam))
-			{
-				case IDC_SIGNED:
-					t='s';
-					return true;
-				case IDC_UNSIGNED:
-					t='u';
-					return true;
-				case IDC_HEX:
-					t='h';
-					return true;
-				case IDC_1_BYTE:
-					s = 'b';
-					return true;
-				case IDC_2_BYTES:
-					s = 'w';
-					return true;
-				case IDC_4_BYTES:
-					s = 'd';
-					return true;
-				case IDOK:
-				{
-					if (s && t)
-					{
-						AddressWatcher Temp;
-						Temp.Size = s;
-						Temp.Type = t;
-						Temp.WrongEndian = false; //replace this when I get little endian working properly
-						GetDlgItemText(hDlg,IDC_EDIT_COMPAREADDRESS,Str_Tmp,1024);
-						char *addrstr = Str_Tmp;
-						if (strlen(Str_Tmp) > 8) addrstr = &(Str_Tmp[strlen(Str_Tmp) - 9]);
-						for(int i = 0; addrstr[i]; i++) {if(toupper(addrstr[i]) == 'O') addrstr[i] = '0';}
-						sscanf(addrstr,"%04X",&(Temp.Address));
-
-						if((Temp.Address & ~0xFFFFFF) == ~0xFFFFFF)
-							Temp.Address &= 0xFFFFFF;
-
-						if(IsHardwareAddressValid(Temp.Address))
-						{
-							GetDlgItemText(hDlg,IDC_PROMPT_EDIT,Str_Tmp,80);
-							if (index < WatchCount) RemoveWatch(index);
-							InsertWatch(Temp,Str_Tmp);
-							if(RamWatchHWnd)
-							{
-								ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
-							}
-							EndDialog(hDlg, true);
-						}
-						else
-						{
-							MessageBox(hDlg,"Invalid Address","ERROR",MB_OK);
-						}
-					}
-					else
-					{
-						strcpy(Str_Tmp,"Error:");
-						if (!s)
-							strcat(Str_Tmp," Size must be specified.");
-						if (!t)
-							strcat(Str_Tmp," Type must be specified.");
-						MessageBox(hDlg,Str_Tmp,"ERROR",MB_OK);
-					}
-					RWfileChanged=true;
-					return true;
-					break;
-				}
-				case IDCANCEL:
-					EndDialog(hDlg, false);
-					return false;
-					break;
-			}
-			break;
-
-		case WM_CLOSE:
-			EndDialog(hDlg, false);
-			return false;
-			break;
-	}
-
-	return false;
-}
-
-
-
-
-void RamWatchEnableCommand(HWND hDlg, HMENU hMenu, UINT uIDEnableItem, bool enable)
-{
-	EnableWindow(GetDlgItem(hDlg, uIDEnableItem), (enable?TRUE:FALSE));
-	if (hMenu != NULL) {
-		if (uIDEnableItem == ID_WATCHES_UPDOWN) {
-			EnableMenuItem(hMenu, IDC_C_WATCH_UP, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
-			EnableMenuItem(hMenu, IDC_C_WATCH_DOWN, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
-		}
-		else
-			EnableMenuItem(hMenu, uIDEnableItem, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
-	}
-}
-
-void RefreshWatchListSelectedCountControlStatus(HWND hDlg)
-{
-	static int prevSelCount=-1;
-	int selCount = ListView_GetSelectedCount(GetDlgItem(hDlg,IDC_WATCHLIST));
-	if(selCount != prevSelCount)
-	{
-		if(selCount < 2 || prevSelCount < 2)
-		{
-			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_WATCH_EDIT, selCount == 1);
-			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_WATCH_REMOVE, selCount >= 1);
-			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_WATCH_DUPLICATE, selCount == 1);
-			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_ADDCHEAT, selCount == 1);
-			RamWatchEnableCommand(hDlg, ramwatchmenu, ID_WATCHES_UPDOWN, selCount == 1);
-		}
-		prevSelCount = selCount;
-	}
-}
-
-LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	RECT r;
-	RECT r2;
-	int dx1, dy1, dx2, dy2;
-	static int watchIndex=0;
-
-	switch(uMsg)
-	{
-		case WM_MOVE: {
-			if (!IsIconic(hDlg)) {
-			RECT wrect;
-			GetWindowRect(hDlg,&wrect);
-			ramw_x = wrect.left;
-			ramw_y = wrect.top;
-
+
+#include <windows.h>
+#include "common.h"
+#include "main.h"
+using namespace std;
+
+#include "resource.h"
+#include "ram_search.h"
+#include "ramwatch.h"
+#include "cheat.h"
+#include <assert.h>
+#include <windows.h>
+#include <commctrl.h>
+#include <string>
+
+/*
+#include <commctrl.h>
+#pragma comment(lib, "comctl32.lib")
+#include <shellapi.h>
+#pragma comment(lib, "shell32.lib")
+#include <commdlg.h>
+#pragma comment(lib, "comdlg32.lib")
+*/
+
+static HMENU ramwatchmenu;
+static HMENU rwrecentmenu;
+/*static*/ HACCEL RamWatchAccels = NULL;
+char rw_recent_files[MAX_RECENT_WATCHES][1024] = {"","","","",""};
+//char Watch_Dir[1024]="";
+bool RWfileChanged = false; //Keeps track of whether the current watch file has been changed, if so, ramwatch will prompt to save changes
+bool AutoRWLoad = false;    //Keeps track of whether Auto-load is checked
+bool RWSaveWindowPos = false; //Keeps track of whether Save Window position is checked
+char currentWatch[1024];
+int ramw_x, ramw_y;			//Used to store ramwatch dialog window positions
+AddressWatcher rswatches[MAX_WATCH_COUNT];
+int WatchCount=0;
+
+char applicationPath[2048];
+struct InitRamWatch
+{
+	InitRamWatch()
+	{
+		GetModuleFileName(NULL, applicationPath, 2048);
+	}
+} initRamWatch;
+
+HWND RamWatchHWnd;
+#define gamefilename GetRomName()
+#define hWnd hAppWnd
+#define hInst fceu_hInstance
+static char Str_Tmp [1024];
+
+void init_list_box(HWND Box, const char* Strs[], int numColumns, int *columnWidths); //initializes the ram search and/or ram watch listbox
+
+#define MESSAGEBOXPARENT (RamWatchHWnd ? RamWatchHWnd : hWnd)
+
+bool QuickSaveWatches();
+bool ResetWatches();
+
+void RefreshWatchListSelectedCountControlStatus(HWND hDlg);
+
+unsigned int GetCurrentValue(AddressWatcher& watch)
+{
+	//TODO: A similar if for 4-byte just to be through, but there shouldn't be any reason to have 4-byte on the NES!
+	if (watch.Size == 'w')	//Do little endian
+	{
+		unsigned int x = ReadValueAtHardwareAddress(watch.Address+1, 1) * 256;
+		x += ReadValueAtHardwareAddress(watch.Address, 1);
+		return x;
+	}
+	else
+		return ReadValueAtHardwareAddress(watch.Address, watch.Size == 'd' ? 4 : watch.Size == 'w' ? 2 : 1);
+}
+
+bool IsSameWatch(const AddressWatcher& l, const AddressWatcher& r)
+{
+	if (r.Size == 'S') return false;
+	return ((l.Address == r.Address) && (l.Size == r.Size) && (l.Type == r.Type)/* && (l.WrongEndian == r.WrongEndian)*/);
+}
+
+bool VerifyWatchNotAlreadyAdded(const AddressWatcher& watch)
+{
+	for (int j = 0; j < WatchCount; j++)
+	{
+		if (IsSameWatch(rswatches[j], watch))
+		{
+			if(RamWatchHWnd)
+				SetForegroundWindow(RamWatchHWnd);
+			return false;
+		}
+	}
+	return true;
+}
+
+
+bool InsertWatch(const AddressWatcher& Watch, char *Comment)
+{
+	if(!VerifyWatchNotAlreadyAdded(Watch))
+		return false;
+
+	if(WatchCount >= MAX_WATCH_COUNT)
+		return false;
+
+	int i = WatchCount++;
+	AddressWatcher& NewWatch = rswatches[i];
+	NewWatch = Watch;
+	//if (NewWatch.comment) free(NewWatch.comment);
+	NewWatch.comment = (char *) malloc(strlen(Comment)+2);
+	NewWatch.CurValue = GetCurrentValue(NewWatch);
+	strcpy(NewWatch.comment, Comment);
+	ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
+	RWfileChanged=true;
+
+	return true;
+}
+
+LRESULT CALLBACK PromptWatchNameProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) //Gets the description of a watched address
+{
+	RECT r;
+	RECT r2;
+	int dx1, dy1, dx2, dy2;
+
+	switch(uMsg)
+	{
+		case WM_INITDIALOG:
+			//Clear_Sound_Buffer();
+
+			GetWindowRect(hWnd, &r);
+			dx1 = (r.right - r.left) / 2;
+			dy1 = (r.bottom - r.top) / 2;
+
+			GetWindowRect(hDlg, &r2);
+			dx2 = (r2.right - r2.left) / 2;
+			dy2 = (r2.bottom - r2.top) / 2;
+
+			//SetWindowPos(hDlg, NULL, max(0, r.left + (dx1 - dx2)), max(0, r.top + (dy1 - dy2)), NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
+			SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
+			strcpy(Str_Tmp,"Enter a name for this RAM address.");
+			SendDlgItemMessage(hDlg,IDC_PROMPT_TEXT,WM_SETTEXT,0,(LPARAM)Str_Tmp);
+			strcpy(Str_Tmp,"");
+			SendDlgItemMessage(hDlg,IDC_PROMPT_TEXT2,WM_SETTEXT,0,(LPARAM)Str_Tmp);
+			return true;
+			break;
+
+		case WM_COMMAND:
+			switch(LOWORD(wParam))
+			{
+				case IDOK:
+				{
+					GetDlgItemText(hDlg,IDC_PROMPT_EDIT,Str_Tmp,80);
+					InsertWatch(rswatches[WatchCount],Str_Tmp);
+					EndDialog(hDlg, true);
+					return true;
+					break;
+				}
+				case IDCANCEL:
+					EndDialog(hDlg, false);
+					return false;
+					break;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hDlg, false);
+			return false;
+			break;
+	}
+
+	return false;
+}
+
+bool InsertWatch(const AddressWatcher& Watch, HWND parent)
+{
+	if(!VerifyWatchNotAlreadyAdded(Watch))
+		return false;
+
+	if(!parent)
+		parent = RamWatchHWnd;
+	if(!parent)
+		parent = hWnd;
+
+	int prevWatchCount = WatchCount;
+
+	rswatches[WatchCount] = Watch;
+	rswatches[WatchCount].CurValue = GetCurrentValue(rswatches[WatchCount]);
+	DialogBox(hInst, MAKEINTRESOURCE(IDD_PROMPT), parent, (DLGPROC) PromptWatchNameProc);
+
+	return WatchCount > prevWatchCount;
+}
+
+void Update_RAM_Watch()
+{
+	BOOL watchChanged[MAX_WATCH_COUNT] = {0};
+
+	if(WatchCount)
+	{
+		// update cached values and detect changes to displayed listview items
+
+		for(int i = 0; i < WatchCount; i++)
+		{
+			unsigned int prevCurValue = rswatches[i].CurValue;
+			unsigned int newCurValue = GetCurrentValue(rswatches[i]);
+			if(prevCurValue != newCurValue)
+			{
+				rswatches[i].CurValue = newCurValue;
+				watchChanged[i] = TRUE;
+			}
+		}
+	}
+
+	// refresh any visible parts of the listview box that changed
+	HWND lv = GetDlgItem(RamWatchHWnd,IDC_WATCHLIST);
+	int top = ListView_GetTopIndex(lv);
+	int bottom = top + ListView_GetCountPerPage(lv) + 1; // +1 is so we will update a partially-displayed last item
+	if(top < 0) top = 0;
+	if(bottom > WatchCount) bottom = WatchCount;
+	int start = -1;
+	for(int i = top; i <= bottom; i++)
+	{
+		if(start == -1)
+		{
+			if(i != bottom && watchChanged[i])
+			{
+				start = i;
+				//somethingChanged = true;
+			}
+		}
+		else
+		{
+			if(i == bottom || !watchChanged[i])
+			{
+				ListView_RedrawItems(lv, start, i-1);
+				start = -1;
+			}
+		}
+	}
+}
+
+bool AskSave()
+{
+	//This function asks to save changes if the watch file contents have changed
+	//returns false only if a save was attempted but failed or was cancelled
+	if (RWfileChanged)
+	{
+		int answer = MessageBox(MESSAGEBOXPARENT, "Save Changes?", "Ram Watch", MB_YESNOCANCEL);
+		if(answer == IDYES)
+			if(!QuickSaveWatches())
+				return false;
+		return (answer != IDCANCEL);
+	}
+	return true;
+}
+
+void WriteRecentRWFiles()
+{
+	char str[2048];
+	for (int i = 0; i < MAX_RECENT_WATCHES; i++)
+	{
+		sprintf(str, "recentWatch%d", i+1);
+		//regSetStringValue(str, &rw_recent_files[i][0]); TODO
+	}
+}
+
+void UpdateRW_RMenu(HMENU menu, unsigned int mitem, unsigned int baseid)
+{
+	MENUITEMINFO moo;
+	int x;
+
+	moo.cbSize = sizeof(moo);
+	moo.fMask = MIIM_SUBMENU | MIIM_STATE;
+
+	GetMenuItemInfo(GetSubMenu(ramwatchmenu, 0), mitem, FALSE, &moo);
+	moo.hSubMenu = menu;
+	moo.fState = strlen(rw_recent_files[0]) ? MFS_ENABLED : MFS_GRAYED;
+
+	SetMenuItemInfo(GetSubMenu(ramwatchmenu, 0), mitem, FALSE, &moo);
+
+	// Remove all recent files submenus
+	for(x = 0; x < MAX_RECENT_WATCHES; x++)
+	{
+		RemoveMenu(menu, baseid + x, MF_BYCOMMAND);
+	}
+
+	// Recreate the menus
+	for(x = MAX_RECENT_WATCHES - 1; x >= 0; x--)
+	{  
+		char tmp[128 + 5];
+
+		// Skip empty strings
+		if(!strlen(rw_recent_files[x]))
+		{
+			continue;
+		}
+
+		moo.cbSize = sizeof(moo);
+		moo.fMask = MIIM_DATA | MIIM_ID | MIIM_TYPE;
+
+		// Fill in the menu text.
+		if(strlen(rw_recent_files[x]) < 128)
+		{
+			sprintf(tmp, "&%d. %s", ( x + 1 ) % 10, rw_recent_files[x]);
+		}
+		else
+		{
+			sprintf(tmp, "&%d. %s", ( x + 1 ) % 10, rw_recent_files[x] + strlen( rw_recent_files[x] ) - 127);
+		}
+
+		// Insert the menu item
+		moo.cch = strlen(tmp);
+		moo.fType = 0;
+		moo.wID = baseid + x;
+		moo.dwTypeData = tmp;
+		InsertMenuItem(menu, 0, 1, &moo);
+	}
+
+	// I don't think one function shall do so many things in a row
+//	WriteRecentRWFiles();	// write recent menu to ini
+}
+
+void UpdateRWRecentArray(const char* addString, unsigned int arrayLen, HMENU menu, unsigned int menuItem, unsigned int baseId)
+{
+	const size_t len = 1024; // Avoid magic numbers
+
+	// Try to find out if the filename is already in the recent files list.
+	for(unsigned int x = 0; x < arrayLen; x++)
+	{
+		if(strlen(rw_recent_files[x]))
+		{
+			if(!strncmp(rw_recent_files[x], addString, 1024))    // Item is already in list.
+			{
+				// If the filename is in the file list don't add it again.
+				// Move it up in the list instead.
+
+				int y;
+				char tmp[len];
+
+				// Save pointer.
+				strncpy(tmp, rw_recent_files[x], len);
+				
+				for(y = x; y; y--)
+				{
+					// Move items down.
+					strncpy(rw_recent_files[y],rw_recent_files[y - 1], len);
+				}
+
+				// Put item on top.
+				strncpy(rw_recent_files[0],tmp, len);
+
+				// Update the recent files menu
+				UpdateRW_RMenu(menu, menuItem, baseId);
+
+				return;
+			}
+		}
+	}
+
+	// The filename wasn't found in the list. That means we need to add it.
+
+	// Move the other items down.
+	for(unsigned int x = arrayLen - 1; x; x--)
+	{
+		strncpy(rw_recent_files[x],rw_recent_files[x - 1], len);
+	}
+
+	// Add the new item.
+	strncpy(rw_recent_files[0], addString, len);
+
+	// Update the recent files menu
+	UpdateRW_RMenu(menu, menuItem, baseId);
+}
+
+void RWAddRecentFile(const char *filename)
+{
+	UpdateRWRecentArray(filename, MAX_RECENT_WATCHES, rwrecentmenu, RAMMENU_FILE_RECENT, RW_MENU_FIRST_RECENT_FILE);
+}
+
+void OpenRWRecentFile(int memwRFileNumber)
+{
+	if(!ResetWatches())
+		return;
+
+	int rnum = memwRFileNumber;
+	if ((unsigned int)rnum >= MAX_RECENT_WATCHES)
+		return; //just in case
+
+	char* x;
+
+	while(true)
+	{
+		x = rw_recent_files[rnum];
+		if (!*x) 
+			return;		//If no recent files exist just return.  Useful for Load last file on startup (or if something goes screwy)
+
+		if (rnum) //Change order of recent files if not most recent
+		{
+			RWAddRecentFile(x);
+			rnum = 0;
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	strcpy(currentWatch,x);
+	strcpy(Str_Tmp,currentWatch);
+
+	//loadwatches here
+	FILE *WatchFile = fopen(Str_Tmp,"rb");
+	if (!WatchFile)
+	{
+		int answer = MessageBox(MESSAGEBOXPARENT,"Error opening file.","ERROR",MB_OKCANCEL);
+		if (answer == IDOK)
+		{
+			rw_recent_files[rnum][0] = '\0';	//Clear file from list 
+			if (rnum)							//Update the ramwatch list
+				RWAddRecentFile(rw_recent_files[0]); 
+			else
+				RWAddRecentFile(rw_recent_files[1]);
+		}
+		return;
+	}
+	const char DELIM = '\t';
+	AddressWatcher Temp;
+	char mode;
+	fgets(Str_Tmp,1024,WatchFile);
+	sscanf(Str_Tmp,"%c%*s",&mode);
+	//if ((mode == '1' && !(SegaCD_Started)) || (mode == '2' && !(_32X_Started)))
+	//{
+	//	char Device[8];
+	//	strcpy(Device,(mode > '1')?"32X":"SegaCD");
+	//	sprintf(Str_Tmp,"Warning: %s not started. \nWatches for %s addresses will be ignored.",Device,Device);
+	//	MessageBox(MESSAGEBOXPARENT,Str_Tmp,"Possible Device Mismatch",MB_OK);
+	//}
+	int WatchAdd;
+	fgets(Str_Tmp,1024,WatchFile);
+	sscanf(Str_Tmp,"%d%*s",&WatchAdd);
+	WatchAdd+=WatchCount;
+	for (int i = WatchCount; i < WatchAdd; i++)
+	{
+		while (i < 0)
+			i++;
+		do {
+			fgets(Str_Tmp,1024,WatchFile);
+		} while (Str_Tmp[0] == '\n');
+		sscanf(Str_Tmp,"%*05X%*c%04X%*c%c%*c%c%*c%d",&(Temp.Address),&(Temp.Size),&(Temp.Type),&(Temp.WrongEndian));
+		Temp.WrongEndian = 0;
+		char *Comment = strrchr(Str_Tmp,DELIM) + 1;
+		*strrchr(Comment,'\n') = '\0';
+		InsertWatch(Temp,Comment);
+	}
+
+	fclose(WatchFile);
+	if (RamWatchHWnd) {
+		ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
+		RefreshWatchListSelectedCountControlStatus(RamWatchHWnd);
+	}
+	RWfileChanged=false;
+	return;
+}
+
+int Change_File_L(char *Dest, char *Dir, char *Titre, char *Filter, char *Ext, HWND hwnd)
+{
+	OPENFILENAME ofn;
+
+	SetCurrentDirectory(applicationPath);
+
+	if (!strcmp(Dest, ""))
+	{
+		strcpy(Dest, "default.");
+		strcat(Dest, Ext);
+	}
+
+	memset(&ofn, 0, sizeof(OPENFILENAME));
+
+	ofn.lStructSize = sizeof(OPENFILENAME);
+	ofn.hwndOwner = hwnd;
+	ofn.hInstance = hInst;
+	ofn.lpstrFile = Dest;
+	ofn.nMaxFile = 2047;
+	ofn.lpstrFilter = Filter;
+	ofn.nFilterIndex = 1;
+	ofn.lpstrInitialDir = Dir;
+	ofn.lpstrTitle = Titre;
+	ofn.lpstrDefExt = Ext;
+	ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
+
+	if (GetOpenFileName(&ofn)) return 1;
+
+	return 0;
+}
+
+int Change_File_S(char *Dest, char *Dir, char *Titre, char *Filter, char *Ext, HWND hwnd)
+{
+	OPENFILENAME ofn;
+
+	SetCurrentDirectory(applicationPath);
+
+	if (!strcmp(Dest, ""))
+	{
+		strcpy(Dest, "default.");
+		strcat(Dest, Ext);
+	}
+
+	memset(&ofn, 0, sizeof(OPENFILENAME));
+
+	ofn.lStructSize = sizeof(OPENFILENAME);
+	ofn.hwndOwner = hwnd;
+	ofn.hInstance = hInst;
+	ofn.lpstrFile = Dest;
+	ofn.nMaxFile = 2047;
+	ofn.lpstrFilter = Filter;
+	ofn.nFilterIndex = 1;
+	ofn.lpstrInitialDir = Dir;
+	ofn.lpstrTitle = Titre;
+	ofn.lpstrDefExt = Ext;
+	ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
+
+	if (GetSaveFileName(&ofn)) {
+		return 1;
+	}
+
+	return 0;
+}
+
+bool Save_Watches()
+{
+	const char* slash = max(strrchr(gamefilename, '|'), max(strrchr(gamefilename, '\\'), strrchr(gamefilename, '/')));
+	strcpy(Str_Tmp,slash ? slash+1 : gamefilename);
+	char* dot = strrchr(Str_Tmp, '.');
+	if(dot) *dot = 0;
+	if(Change_File_S(Str_Tmp, applicationPath, "Save Watches", "Watchlist (*.wch)\0*.wch\0All Files (*.*)\0*.*\0\0", "wch", RamWatchHWnd))
+	{
+		FILE *WatchFile = fopen(Str_Tmp,"r+b");
+		if (!WatchFile) WatchFile = fopen(Str_Tmp,"w+b");
+		fputc('\n',WatchFile);
+		strcpy(currentWatch,Str_Tmp);
+		RWAddRecentFile(currentWatch);
+		sprintf(Str_Tmp,"%d\n",WatchCount);
+		fputs(Str_Tmp,WatchFile);
+		const char DELIM = '\t';
+		for (int i = 0; i < WatchCount; i++)
+		{
+			sprintf(Str_Tmp,"%05X%c%04X%c%c%c%c%c%d%c%s\n",i,DELIM,rswatches[i].Address,DELIM,rswatches[i].Size,DELIM,rswatches[i].Type,DELIM,rswatches[i].WrongEndian,DELIM,rswatches[i].comment);
+			fputs(Str_Tmp,WatchFile);
+		}
+		
+		fclose(WatchFile);
+		RWfileChanged=false;
+		//TODO: Add to recent list function call here
+		return true;
+	}
+	return false;
+}
+
+bool QuickSaveWatches()
+{
+if (RWfileChanged==false) return true; //If file has not changed, no need to save changes
+if (currentWatch[0] == NULL) //If there is no currently loaded file, run to Save as and then return
+	{
+		return Save_Watches();
+	}
+		
+		strcpy(Str_Tmp,currentWatch);
+		FILE *WatchFile = fopen(Str_Tmp,"r+b");
+		if (!WatchFile) WatchFile = fopen(Str_Tmp,"w+b");
+		fputc('\n',WatchFile);
+		sprintf(Str_Tmp,"%d\n",WatchCount);
+		fputs(Str_Tmp,WatchFile);
+		const char DELIM = '\t';
+		for (int i = 0; i < WatchCount; i++)
+		{
+			sprintf(Str_Tmp,"%05X%c%04X%c%c%c%c%c%d%c%s\n",i,DELIM,rswatches[i].Address,DELIM,rswatches[i].Size,DELIM,rswatches[i].Type,DELIM,rswatches[i].WrongEndian,DELIM,rswatches[i].comment);
+			fputs(Str_Tmp,WatchFile);
+		}
+		fclose(WatchFile);
+		RWfileChanged=false;
+		return true;
+}
+
+bool Load_Watches(bool clear, const char* filename)
+{
+	const char DELIM = '\t';
+	FILE* WatchFile = fopen(filename,"rb");
+	if (!WatchFile)
+	{
+		MessageBox(MESSAGEBOXPARENT,"Error opening file.","ERROR",MB_OK);
+		return false;
+	}
+	if(clear)
+	{
+		if(!ResetWatches())
+		{
+			fclose(WatchFile);
+			return false;
+		}
+	}
+	strcpy(currentWatch,filename);
+	RWAddRecentFile(currentWatch);
+	AddressWatcher Temp;
+	Temp.Address = 0;	// default values
+	Temp.Size = 'b';
+	Temp.Type = 'h';
+	char mode;
+	fgets(Str_Tmp,1024,WatchFile);
+	sscanf(Str_Tmp,"%c%*s",&mode);
+	int WatchAdd;
+	fgets(Str_Tmp,1024,WatchFile);
+	sscanf(Str_Tmp,"%d%*s",&WatchAdd);
+	WatchAdd+=WatchCount;
+	for (int i = WatchCount; i < WatchAdd; i++)
+	{
+		if (i < 0) i = 0;
+		memset(Str_Tmp, 0, 1024);
+		do
+		{
+			fgets(Str_Tmp, 1024, WatchFile);
+		} while (Str_Tmp[0] == '\n');
+		sscanf(Str_Tmp, "%*05X%*c%04X%*c%c%*c%c%*c%*c", &(Temp.Address), &(Temp.Size), &(Temp.Type));
+		Temp.WrongEndian = false;
+		char *Comment = strrchr(Str_Tmp, DELIM);
+		if (Comment)
+		{
+			Comment++;
+			char *CommentEnd = strrchr(Comment, '\n');
+			if (CommentEnd)
+			{
+				*CommentEnd = '\0';
+				InsertWatch(Temp, Comment);
+			} else
+			{
+				// the wch file is probably corrupted
+				InsertWatch(Temp, Comment);
+				break;
+			}
+		} else
+			break;	// the wch file is probably corrupted
+	}
+	
+	fclose(WatchFile);
+	if (RamWatchHWnd)
+		ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
+	RWfileChanged=false;
+	return true;
+}
+
+bool Load_Watches(bool clear)
+{
+	const char* slash = max(strrchr(gamefilename, '|'), max(strrchr(gamefilename, '\\'), strrchr(gamefilename, '/')));
+	strcpy(Str_Tmp,slash ? slash+1 : gamefilename);
+	char* dot = strrchr(Str_Tmp, '.');
+	if(dot) *dot = 0;
+	strcat(Str_Tmp,".wch");
+	if(Change_File_L(Str_Tmp, applicationPath, "Load Watches", "Watchlist (*.wch)\0*.wch\0All Files (*.*)\0*.*\0\0", "wch", RamWatchHWnd))
+	{
+		return Load_Watches(clear, Str_Tmp);
+	}
+	return false;
+}
+
+bool ResetWatches()
+{
+	if(!AskSave())
+		return false;
+	for (;WatchCount>=0;WatchCount--)
+	{
+		free(rswatches[WatchCount].comment);
+		rswatches[WatchCount].comment = NULL;
+	}
+	WatchCount++;
+	if (RamWatchHWnd) {
+		ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
+		RefreshWatchListSelectedCountControlStatus(RamWatchHWnd);
+	}
+	RWfileChanged = false;
+	currentWatch[0] = NULL;
+	return true;
+}
+
+void RemoveWatch(int watchIndex)
+{
+	free(rswatches[watchIndex].comment);
+	rswatches[watchIndex].comment = NULL;
+	for (int i = watchIndex; i <= WatchCount; i++)
+		rswatches[i] = rswatches[i+1];
+	WatchCount--;
+}
+
+void RefreshWatchListSelectedItemControlStatus(HWND hDlg)
+{
+	static int prevSelIndex=-1;
+	int selIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_RAMLIST));
+	if(selIndex != prevSelIndex)
+	{
+		if(selIndex == -1 || prevSelIndex == -1)
+		{
+			EnableWindow(GetDlgItem(hDlg, IDC_C_ADDCHEAT), (selIndex != -1) ? TRUE : FALSE);
+		}
+		prevSelIndex = selIndex;
+	}
+}
+
+LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) //Gets info for a RAM Watch, and then inserts it into the Watch List
+{
+	RECT r;
+	RECT r2;
+	int dx1, dy1, dx2, dy2;
+	static int index;
+	static char s,t = s = 0;
+
+	switch(uMsg)
+	{
+		case WM_INITDIALOG:
+			//Clear_Sound_Buffer();
+			
+
+			GetWindowRect(hWnd, &r);
+			dx1 = (r.right - r.left) / 2;
+			dy1 = (r.bottom - r.top) / 2;
+
+			GetWindowRect(hDlg, &r2);
+			dx2 = (r2.right - r2.left) / 2;
+			dy2 = (r2.bottom - r2.top) / 2;
+
+			//SetWindowPos(hDlg, NULL, max(0, r.left + (dx1 - dx2)), max(0, r.top + (dy1 - dy2)), NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
+			SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
+			index = (int)lParam;
+			sprintf(Str_Tmp,"%04X",rswatches[index].Address);
+			SetDlgItemText(hDlg,IDC_EDIT_COMPAREADDRESS,Str_Tmp);
+			if (rswatches[index].comment != NULL)
+				SetDlgItemText(hDlg,IDC_PROMPT_EDIT,rswatches[index].comment);
+			s = rswatches[index].Size;
+			t = rswatches[index].Type;
+			switch (s)
+			{
+				case 'b':
+					SendDlgItemMessage(hDlg, IDC_1_BYTE, BM_SETCHECK, BST_CHECKED, 0);
+					break;
+				case 'w':
+					SendDlgItemMessage(hDlg, IDC_2_BYTES, BM_SETCHECK, BST_CHECKED, 0);
+					break;
+				case 'd':
+					SendDlgItemMessage(hDlg, IDC_4_BYTES, BM_SETCHECK, BST_CHECKED, 0);
+					break;
+				default:
+					s = 0;
+					break;
+			}
+			switch (t)
+			{
+				case 's':
+					SendDlgItemMessage(hDlg, IDC_SIGNED, BM_SETCHECK, BST_CHECKED, 0);
+					break;
+				case 'u':
+					SendDlgItemMessage(hDlg, IDC_UNSIGNED, BM_SETCHECK, BST_CHECKED, 0);
+					break;
+				case 'h':
+					SendDlgItemMessage(hDlg, IDC_HEX, BM_SETCHECK, BST_CHECKED, 0);
+					break;
+				default:
+					t = 0;
+					break;
+			}
+
+			return true;
+			break;
+		
+		case WM_COMMAND:
+			switch(LOWORD(wParam))
+			{
+				case IDC_SIGNED:
+					t='s';
+					return true;
+				case IDC_UNSIGNED:
+					t='u';
+					return true;
+				case IDC_HEX:
+					t='h';
+					return true;
+				case IDC_1_BYTE:
+					s = 'b';
+					return true;
+				case IDC_2_BYTES:
+					s = 'w';
+					return true;
+				case IDC_4_BYTES:
+					s = 'd';
+					return true;
+				case IDOK:
+				{
+					if (s && t)
+					{
+						AddressWatcher Temp;
+						Temp.Size = s;
+						Temp.Type = t;
+						Temp.WrongEndian = false; //replace this when I get little endian working properly
+						GetDlgItemText(hDlg,IDC_EDIT_COMPAREADDRESS,Str_Tmp,1024);
+						char *addrstr = Str_Tmp;
+						if (strlen(Str_Tmp) > 8) addrstr = &(Str_Tmp[strlen(Str_Tmp) - 9]);
+						for(int i = 0; addrstr[i]; i++) {if(toupper(addrstr[i]) == 'O') addrstr[i] = '0';}
+						sscanf(addrstr,"%04X",&(Temp.Address));
+
+						if((Temp.Address & ~0xFFFFFF) == ~0xFFFFFF)
+							Temp.Address &= 0xFFFFFF;
+
+						if(IsHardwareAddressValid(Temp.Address))
+						{
+							GetDlgItemText(hDlg,IDC_PROMPT_EDIT,Str_Tmp,80);
+							if (index < WatchCount) RemoveWatch(index);
+							InsertWatch(Temp,Str_Tmp);
+							if(RamWatchHWnd)
+							{
+								ListView_SetItemCount(GetDlgItem(RamWatchHWnd,IDC_WATCHLIST),WatchCount);
+							}
+							EndDialog(hDlg, true);
+						}
+						else
+						{
+							MessageBox(hDlg,"Invalid Address","ERROR",MB_OK);
+						}
+					}
+					else
+					{
+						strcpy(Str_Tmp,"Error:");
+						if (!s)
+							strcat(Str_Tmp," Size must be specified.");
+						if (!t)
+							strcat(Str_Tmp," Type must be specified.");
+						MessageBox(hDlg,Str_Tmp,"ERROR",MB_OK);
+					}
+					RWfileChanged=true;
+					return true;
+					break;
+				}
+				case IDCANCEL:
+					EndDialog(hDlg, false);
+					return false;
+					break;
+			}
+			break;
+
+		case WM_CLOSE:
+			EndDialog(hDlg, false);
+			return false;
+			break;
+	}
+
+	return false;
+}
+
+
+
+
+void RamWatchEnableCommand(HWND hDlg, HMENU hMenu, UINT uIDEnableItem, bool enable)
+{
+	EnableWindow(GetDlgItem(hDlg, uIDEnableItem), (enable?TRUE:FALSE));
+	if (hMenu != NULL) {
+		if (uIDEnableItem == ID_WATCHES_UPDOWN) {
+			EnableMenuItem(hMenu, IDC_C_WATCH_UP, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
+			EnableMenuItem(hMenu, IDC_C_WATCH_DOWN, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
+		}
+		else
+			EnableMenuItem(hMenu, uIDEnableItem, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
+	}
+}
+
+void RefreshWatchListSelectedCountControlStatus(HWND hDlg)
+{
+	static int prevSelCount=-1;
+	int selCount = ListView_GetSelectedCount(GetDlgItem(hDlg,IDC_WATCHLIST));
+	if(selCount != prevSelCount)
+	{
+		if(selCount < 2 || prevSelCount < 2)
+		{
+			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_WATCH_EDIT, selCount == 1);
+			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_WATCH_REMOVE, selCount >= 1);
+			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_WATCH_DUPLICATE, selCount == 1);
+			RamWatchEnableCommand(hDlg, ramwatchmenu, IDC_C_ADDCHEAT, selCount == 1);
+			RamWatchEnableCommand(hDlg, ramwatchmenu, ID_WATCHES_UPDOWN, selCount == 1);
+		}
+		prevSelCount = selCount;
+	}
+}
+
+LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	RECT r;
+	RECT r2;
+	int dx1, dy1, dx2, dy2;
+	static int watchIndex=0;
+
+	switch(uMsg)
+	{
+		case WM_MOVE: {
+			if (!IsIconic(hDlg)) {
+			RECT wrect;
+			GetWindowRect(hDlg,&wrect);
+			ramw_x = wrect.left;
+			ramw_y = wrect.top;
+
 			#ifdef WIN32
 			WindowBoundsCheckNoResize(ramw_x,ramw_y,wrect.right);
 			#endif
-			}
-			//regSetDwordValue(RAMWX, ramw_x); TODO
-			//regSetDwordValue(RAMWY, ramw_y); TODO
-		}	break;
-
-		case WM_INITDIALOG: {
-			GetWindowRect(hWnd, &r);  //Ramwatch window
-			dx1 = (r.right - r.left) / 2;
-			dy1 = (r.bottom - r.top) / 2;
-
-			GetWindowRect(hDlg, &r2); // TASer window
-			dx2 = (r2.right - r2.left) / 2;
-			dy2 = (r2.bottom - r2.top) / 2;
-
-			
-			// push it away from the main window if we can
-			const int width = (r.right-r.left);
-			const int height = (r.bottom - r.top);
-			const int width2 = (r2.right-r2.left); 
-			if(r.left+width2 + width < GetSystemMetrics(SM_CXSCREEN))
-			{
-				r.right += width;
-				r.left += width;
-			}
-			else if((int)r.left - (int)width2 > 0)
-			{
-				r.right -= width2;
-				r.left -= width2;
-			}
-			
-			//-----------------------------------------------------------------------------------
-			//If user has Save Window Pos selected, override default positioning
-			if (RWSaveWindowPos)	
-			{
-				//If ramwindow is for some reason completely off screen, use default instead 
-				if (ramw_x > (-width*2) || ramw_x < (width*2 + GetSystemMetrics(SM_CYSCREEN))   ) 
-					r.left = ramw_x;	  //This also ignores cases of windows -32000 error codes
-				//If ramwindow is for some reason completely off screen, use default instead 
-				if (ramw_y > (0-height*2) ||ramw_y < (height*2 + GetSystemMetrics(SM_CYSCREEN))	)
-					r.top = ramw_y;		  //This also ignores cases of windows -32000 error codes
-			}
-			//-------------------------------------------------------------------------------------
-			SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
-			
-			ramwatchmenu=GetMenu(hDlg);
-			rwrecentmenu=CreateMenu();
-			UpdateRW_RMenu(rwrecentmenu, RAMMENU_FILE_RECENT, RW_MENU_FIRST_RECENT_FILE);
-			
-			const char* names[3] = {"Address","Value","Notes"};
-			int widths[3] = {62,64,64+51+53};
-			init_list_box(GetDlgItem(hDlg,IDC_WATCHLIST),names,3,widths);
-			if (!ResultCount)
-				reset_address_info();
-			else
-				signal_new_frame();
-			ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount);
-			if (!noMisalign) SendDlgItemMessage(hDlg, IDC_MISALIGN, BM_SETCHECK, BST_CHECKED, 0);
-			//if (littleEndian) SendDlgItemMessage(hDlg, IDC_ENDIAN, BM_SETCHECK, BST_CHECKED, 0);
-
-			RamWatchAccels = LoadAccelerators(hInst, MAKEINTRESOURCE(IDR_RWACCELERATOR));
-
-			// due to some bug in windows, the arrow button width from the resource gets ignored, so we have to set it here
-			SetWindowPos(GetDlgItem(hDlg,ID_WATCHES_UPDOWN), 0,0,0, 30,60, SWP_NOMOVE);
-
-			Update_RAM_Watch();
-
-			DragAcceptFiles(hDlg, TRUE);
-
-			RefreshWatchListSelectedCountControlStatus(hDlg);
-			return false;
-		}	break;
-		
-		case WM_INITMENU:
-			CheckMenuItem(ramwatchmenu, RAMMENU_FILE_AUTOLOAD, AutoRWLoad ? MF_CHECKED : MF_UNCHECKED);
-			CheckMenuItem(ramwatchmenu, RAMMENU_FILE_SAVEWINDOW, RWSaveWindowPos ? MF_CHECKED : MF_UNCHECKED);
-			break;
-
-		case WM_MENUSELECT:
- 		case WM_ENTERSIZEMOVE:
-			//Clear_Sound_Buffer();
-			break;
-
-		case WM_NOTIFY:
-		{
-			switch(wParam)
-			{
-				case ID_WATCHES_UPDOWN:
-				{
-					switch(((LPNMUPDOWN)lParam)->hdr.code)
-					{
-						case UDN_DELTAPOS: {
-							int delta = ((LPNMUPDOWN)lParam)->iDelta;
-							SendMessage(hDlg, WM_COMMAND, delta<0 ? IDC_C_WATCH_UP : IDC_C_WATCH_DOWN,0);
-						} break;
-					}
-				} break;
-
-				default:
-				{
-					LPNMHDR lP = (LPNMHDR) lParam;
-					switch (lP->code)
-					{
-						case LVN_ITEMCHANGED: // selection changed event
-						{
-							NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)lP;
-							if(pNMListView->uNewState & LVIS_FOCUSED ||
-								(pNMListView->uNewState ^ pNMListView->uOldState) & LVIS_SELECTED)
-							{
-								// disable buttons that we don't have the right number of selected items for
-								RefreshWatchListSelectedCountControlStatus(hDlg);
-							}
-						}	break;
-
-						case LVN_GETDISPINFO:
-						{
-							LV_DISPINFO *Item = (LV_DISPINFO *)lParam;
-							Item->item.mask = LVIF_TEXT;
-							Item->item.state = 0;
-							Item->item.iImage = 0;
-							const unsigned int iNum = Item->item.iItem;
-							static char num[11];
-							switch (Item->item.iSubItem)
-							{
-								case 0:
-									sprintf(num,"%04X",rswatches[iNum].Address);
-									Item->item.pszText = num;
-									return true;
-								case 1: {
-									int i = rswatches[iNum].CurValue;
-									int t = rswatches[iNum].Type;
-									int size = rswatches[iNum].Size;
-									const char* formatString = ((t=='s') ? "%d" : (t=='u') ? "%u" : (size=='d' ? "%08X" : size=='w' ? "%04X" : "%02X"));
-									switch (size)
-									{
-										case 'b':
-										default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break;
-										case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break;
-										case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break;
-										case 'S': sprintf(num, "---------"); break;
-									}
-
-									Item->item.pszText = num;
-								}	return true;
-								case 2:
-									Item->item.pszText = rswatches[iNum].comment ? rswatches[iNum].comment : (char*)"";
-									return true;
-
-								default:
-									return false;
-							}
-						}
-						case LVN_ODFINDITEM:
-						{	
-							// disable search by keyboard typing,
-							// because it interferes with some of the accelerators
-							// and it isn't very useful here anyway
-							SetWindowLong(hDlg, DWL_MSGRESULT, ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST)));
-							return 1;
-						}
-					}
-				}
-			}
-		}	break;
-
-		case WM_COMMAND:
-			switch(LOWORD(wParam))
-			{
-				case RAMMENU_FILE_SAVE:
-					QuickSaveWatches();
-					break;
-
-				case RAMMENU_FILE_SAVEAS:	
-				//case IDC_C_SAVE:
-					return Save_Watches();
-				case RAMMENU_FILE_OPEN:
-					return Load_Watches(true);
-				case RAMMENU_FILE_APPEND:
-				//case IDC_C_LOAD:
-					return Load_Watches(false);
-				case RAMMENU_FILE_NEW:
-				//case IDC_C_RESET:
-					ResetWatches();
-					return true;
-				case IDC_C_WATCH_REMOVE:
-				{
-					HWND watchListControl = GetDlgItem(hDlg, IDC_WATCHLIST);
-					watchIndex = ListView_GetNextItem(watchListControl, -1, LVNI_ALL | LVNI_SELECTED);
-					while (watchIndex >= 0)
-					{
-						RemoveWatch(watchIndex);
-						ListView_DeleteItem(watchListControl, watchIndex);
-						watchIndex = ListView_GetNextItem(watchListControl, -1, LVNI_ALL | LVNI_SELECTED);
-					}
-					RWfileChanged=true;
-					SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
-					return true;
-				}
-				case IDC_C_WATCH_EDIT:
-					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
-					if(watchIndex != -1)
-					{
-						if(rswatches[watchIndex].Size == 'S') return true;
-						DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC) EditWatchProc,(LPARAM) watchIndex);
-						SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
-					}
-					return true;
-				case IDC_C_WATCH:
-					rswatches[WatchCount].Address = rswatches[WatchCount].WrongEndian = 0;
-					rswatches[WatchCount].Size = 'b';
-					rswatches[WatchCount].Type = 's';
-					DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC) EditWatchProc,(LPARAM) WatchCount);
-					SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
-					return true;
-				case IDC_C_WATCH_DUPLICATE:
-					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
-					if(watchIndex != -1)
-					{
-						rswatches[WatchCount].Address = rswatches[watchIndex].Address;
-						rswatches[WatchCount].WrongEndian = rswatches[watchIndex].WrongEndian;
-						rswatches[WatchCount].Size = rswatches[watchIndex].Size;
-						rswatches[WatchCount].Type = rswatches[watchIndex].Type;
-						DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC) EditWatchProc,(LPARAM) WatchCount);
-						SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
-					}
-					return true;
-
-				case IDC_C_WATCH_SEPARATE:
-					AddressWatcher separator;
-					separator.Address = 0;
-					separator.WrongEndian = false;
-					separator.Size = 'S';
-					separator.Type = 'S';
-					InsertWatch(separator, "----------------------------");
-					SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
-					return true;
-					
-				case IDC_C_WATCH_UP:
-				{
-					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
-					if (watchIndex == 0 || watchIndex == -1)
-						return true;
-					void *tmp = malloc(sizeof(AddressWatcher));
-					memcpy(tmp,&(rswatches[watchIndex]),sizeof(AddressWatcher));
-					memcpy(&(rswatches[watchIndex]),&(rswatches[watchIndex - 1]),sizeof(AddressWatcher));
-					memcpy(&(rswatches[watchIndex - 1]),tmp,sizeof(AddressWatcher));
-					free(tmp);
-					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex,0,LVIS_FOCUSED|LVIS_SELECTED);
-					ListView_SetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex-1);
-					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex-1,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED);
-					ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount);
-					RWfileChanged=true;
-					return true;
-				}
-				case IDC_C_WATCH_DOWN:
-				{
-					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
-					if (watchIndex >= WatchCount - 1 || watchIndex == -1)
-						return true;
-					void *tmp = malloc(sizeof(AddressWatcher));
-					memcpy(tmp,&(rswatches[watchIndex]),sizeof(AddressWatcher));
-					memcpy(&(rswatches[watchIndex]),&(rswatches[watchIndex + 1]),sizeof(AddressWatcher));
-					memcpy(&(rswatches[watchIndex + 1]),tmp,sizeof(AddressWatcher));
-					free(tmp);
-					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex,0,LVIS_FOCUSED|LVIS_SELECTED);
-					ListView_SetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex+1);
-					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex+1,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED);
-					ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount);
-					RWfileChanged=true;
-					return true;
-				}
-				case ID_WATCHES_UPDOWN:
-				{
-					int delta = ((LPNMUPDOWN)lParam)->iDelta;
-					SendMessage(hDlg, WM_COMMAND, delta<0 ? IDC_C_WATCH_UP : IDC_C_WATCH_DOWN,0);
-					break;
-				}
-				case RAMMENU_FILE_AUTOLOAD:
-				{
-					AutoRWLoad ^= 1;
-					CheckMenuItem(ramwatchmenu, RAMMENU_FILE_AUTOLOAD, AutoRWLoad ? MF_CHECKED : MF_UNCHECKED);
-					//regSetDwordValue(AUTORWLOAD, AutoRWLoad); TODO
-					break;
-				}
-				case RAMMENU_FILE_SAVEWINDOW:
-				{
-					RWSaveWindowPos ^=1;
-					CheckMenuItem(ramwatchmenu, RAMMENU_FILE_SAVEWINDOW, RWSaveWindowPos ? MF_CHECKED : MF_UNCHECKED);
-					//regSetDwordValue(RWSAVEPOS, RWSaveWindowPos); TODO
-					break;
-				}
-				case IDC_C_ADDCHEAT:
-				{
-					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
-					if(watchIndex >= 0)
-					{
-						unsigned int address = rswatches[watchIndex].Address;
-
-						int sizeType = -1;
-						if(rswatches[watchIndex].Size == 'b')
-							sizeType = 0;
-						else if(rswatches[watchIndex].Size == 'w')
-							sizeType = 1;
-						else if(rswatches[watchIndex].Size == 'd')
-							sizeType = 2;
-
-						int numberType = -1;
-						if(rswatches[watchIndex].Type == 's')
-							numberType = 0;
-						else if(rswatches[watchIndex].Type == 'u')
-							numberType = 1;
-						else if(rswatches[watchIndex].Type == 'h')
-							numberType = 2;
-
-						// Don't open cheat dialog
-
-						switch (sizeType) {
-						case 0: {
+			}
+			//regSetDwordValue(RAMWX, ramw_x); TODO
+			//regSetDwordValue(RAMWY, ramw_y); TODO
+		}	break;
+
+		case WM_INITDIALOG: {
+			GetWindowRect(hWnd, &r);  //Ramwatch window
+			dx1 = (r.right - r.left) / 2;
+			dy1 = (r.bottom - r.top) / 2;
+
+			GetWindowRect(hDlg, &r2); // TASer window
+			dx2 = (r2.right - r2.left) / 2;
+			dy2 = (r2.bottom - r2.top) / 2;
+
+			
+			// push it away from the main window if we can
+			const int width = (r.right-r.left);
+			const int height = (r.bottom - r.top);
+			const int width2 = (r2.right-r2.left); 
+			if(r.left+width2 + width < GetSystemMetrics(SM_CXSCREEN))
+			{
+				r.right += width;
+				r.left += width;
+			}
+			else if((int)r.left - (int)width2 > 0)
+			{
+				r.right -= width2;
+				r.left -= width2;
+			}
+			
+			//-----------------------------------------------------------------------------------
+			//If user has Save Window Pos selected, override default positioning
+			if (RWSaveWindowPos)	
+			{
+				//If ramwindow is for some reason completely off screen, use default instead 
+				if (ramw_x > (-width*2) || ramw_x < (width*2 + GetSystemMetrics(SM_CYSCREEN))   ) 
+					r.left = ramw_x;	  //This also ignores cases of windows -32000 error codes
+				//If ramwindow is for some reason completely off screen, use default instead 
+				if (ramw_y > (0-height*2) ||ramw_y < (height*2 + GetSystemMetrics(SM_CYSCREEN))	)
+					r.top = ramw_y;		  //This also ignores cases of windows -32000 error codes
+			}
+			//-------------------------------------------------------------------------------------
+			SetWindowPos(hDlg, NULL, r.left, r.top, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW);
+			
+			ramwatchmenu=GetMenu(hDlg);
+			rwrecentmenu=CreateMenu();
+			UpdateRW_RMenu(rwrecentmenu, RAMMENU_FILE_RECENT, RW_MENU_FIRST_RECENT_FILE);
+			
+			const char* names[3] = {"Address","Value","Notes"};
+			int widths[3] = {62,64,64+51+53};
+			init_list_box(GetDlgItem(hDlg,IDC_WATCHLIST),names,3,widths);
+			if (!ResultCount)
+				reset_address_info();
+			else
+				signal_new_frame();
+			ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount);
+			if (!noMisalign) SendDlgItemMessage(hDlg, IDC_MISALIGN, BM_SETCHECK, BST_CHECKED, 0);
+			//if (littleEndian) SendDlgItemMessage(hDlg, IDC_ENDIAN, BM_SETCHECK, BST_CHECKED, 0);
+
+			RamWatchAccels = LoadAccelerators(hInst, MAKEINTRESOURCE(IDR_RWACCELERATOR));
+
+			// due to some bug in windows, the arrow button width from the resource gets ignored, so we have to set it here
+			SetWindowPos(GetDlgItem(hDlg,ID_WATCHES_UPDOWN), 0,0,0, 30,60, SWP_NOMOVE);
+
+			Update_RAM_Watch();
+
+			DragAcceptFiles(hDlg, TRUE);
+
+			RefreshWatchListSelectedCountControlStatus(hDlg);
+			return false;
+		}	break;
+		
+		case WM_INITMENU:
+			CheckMenuItem(ramwatchmenu, RAMMENU_FILE_AUTOLOAD, AutoRWLoad ? MF_CHECKED : MF_UNCHECKED);
+			CheckMenuItem(ramwatchmenu, RAMMENU_FILE_SAVEWINDOW, RWSaveWindowPos ? MF_CHECKED : MF_UNCHECKED);
+			break;
+
+		case WM_MENUSELECT:
+ 		case WM_ENTERSIZEMOVE:
+			//Clear_Sound_Buffer();
+			break;
+
+		case WM_NOTIFY:
+		{
+			switch(wParam)
+			{
+				case ID_WATCHES_UPDOWN:
+				{
+					switch(((LPNMUPDOWN)lParam)->hdr.code)
+					{
+						case UDN_DELTAPOS: {
+							int delta = ((LPNMUPDOWN)lParam)->iDelta;
+							SendMessage(hDlg, WM_COMMAND, delta<0 ? IDC_C_WATCH_UP : IDC_C_WATCH_DOWN,0);
+						} break;
+					}
+				} break;
+
+				default:
+				{
+					LPNMHDR lP = (LPNMHDR) lParam;
+					switch (lP->code)
+					{
+						case LVN_ITEMCHANGED: // selection changed event
+						{
+							NM_LISTVIEW* pNMListView = (NM_LISTVIEW*)lP;
+							if(pNMListView->uNewState & LVIS_FOCUSED ||
+								(pNMListView->uNewState ^ pNMListView->uOldState) & LVIS_SELECTED)
+							{
+								// disable buttons that we don't have the right number of selected items for
+								RefreshWatchListSelectedCountControlStatus(hDlg);
+							}
+						}	break;
+
+						case LVN_GETDISPINFO:
+						{
+							LV_DISPINFO *Item = (LV_DISPINFO *)lParam;
+							Item->item.mask = LVIF_TEXT;
+							Item->item.state = 0;
+							Item->item.iImage = 0;
+							const unsigned int iNum = Item->item.iItem;
+							static char num[11];
+							switch (Item->item.iSubItem)
+							{
+								case 0:
+									sprintf(num,"%04X",rswatches[iNum].Address);
+									Item->item.pszText = num;
+									return true;
+								case 1: {
+									int i = rswatches[iNum].CurValue;
+									int t = rswatches[iNum].Type;
+									int size = rswatches[iNum].Size;
+									const char* formatString = ((t=='s') ? "%d" : (t=='u') ? "%u" : (size=='d' ? "%08X" : size=='w' ? "%04X" : "%02X"));
+									switch (size)
+									{
+										case 'b':
+										default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break;
+										case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break;
+										case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break;
+										case 'S': sprintf(num, "---------"); break;
+									}
+
+									Item->item.pszText = num;
+								}	return true;
+								case 2:
+									Item->item.pszText = rswatches[iNum].comment ? rswatches[iNum].comment : (char*)"";
+									return true;
+
+								default:
+									return false;
+							}
+						}
+						case LVN_ODFINDITEM:
+						{	
+							// disable search by keyboard typing,
+							// because it interferes with some of the accelerators
+							// and it isn't very useful here anyway
+							SetWindowLong(hDlg, DWL_MSGRESULT, ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST)));
+							return 1;
+						}
+					}
+				}
+			}
+		}	break;
+
+		case WM_COMMAND:
+			switch(LOWORD(wParam))
+			{
+				case RAMMENU_FILE_SAVE:
+					QuickSaveWatches();
+					break;
+
+				case RAMMENU_FILE_SAVEAS:	
+				//case IDC_C_SAVE:
+					return Save_Watches();
+				case RAMMENU_FILE_OPEN:
+					return Load_Watches(true);
+				case RAMMENU_FILE_APPEND:
+				//case IDC_C_LOAD:
+					return Load_Watches(false);
+				case RAMMENU_FILE_NEW:
+				//case IDC_C_RESET:
+					ResetWatches();
+					return true;
+				case IDC_C_WATCH_REMOVE:
+				{
+					HWND watchListControl = GetDlgItem(hDlg, IDC_WATCHLIST);
+					watchIndex = ListView_GetNextItem(watchListControl, -1, LVNI_ALL | LVNI_SELECTED);
+					while (watchIndex >= 0)
+					{
+						RemoveWatch(watchIndex);
+						ListView_DeleteItem(watchListControl, watchIndex);
+						watchIndex = ListView_GetNextItem(watchListControl, -1, LVNI_ALL | LVNI_SELECTED);
+					}
+					RWfileChanged=true;
+					SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
+					return true;
+				}
+				case IDC_C_WATCH_EDIT:
+					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
+					if(watchIndex != -1)
+					{
+						if(rswatches[watchIndex].Size == 'S') return true;
+						DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC) EditWatchProc,(LPARAM) watchIndex);
+						SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
+					}
+					return true;
+				case IDC_C_WATCH:
+					rswatches[WatchCount].Address = rswatches[WatchCount].WrongEndian = 0;
+					rswatches[WatchCount].Size = 'b';
+					rswatches[WatchCount].Type = 's';
+					DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC) EditWatchProc,(LPARAM) WatchCount);
+					SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
+					return true;
+				case IDC_C_WATCH_DUPLICATE:
+					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
+					if(watchIndex != -1)
+					{
+						rswatches[WatchCount].Address = rswatches[watchIndex].Address;
+						rswatches[WatchCount].WrongEndian = rswatches[watchIndex].WrongEndian;
+						rswatches[WatchCount].Size = rswatches[watchIndex].Size;
+						rswatches[WatchCount].Type = rswatches[watchIndex].Type;
+						DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_EDITWATCH), hDlg, (DLGPROC) EditWatchProc,(LPARAM) WatchCount);
+						SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
+					}
+					return true;
+
+				case IDC_C_WATCH_SEPARATE:
+					AddressWatcher separator;
+					separator.Address = 0;
+					separator.WrongEndian = false;
+					separator.Size = 'S';
+					separator.Type = 'S';
+					InsertWatch(separator, "----------------------------");
+					SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
+					return true;
+					
+				case IDC_C_WATCH_UP:
+				{
+					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
+					if (watchIndex == 0 || watchIndex == -1)
+						return true;
+					void *tmp = malloc(sizeof(AddressWatcher));
+					memcpy(tmp,&(rswatches[watchIndex]),sizeof(AddressWatcher));
+					memcpy(&(rswatches[watchIndex]),&(rswatches[watchIndex - 1]),sizeof(AddressWatcher));
+					memcpy(&(rswatches[watchIndex - 1]),tmp,sizeof(AddressWatcher));
+					free(tmp);
+					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex,0,LVIS_FOCUSED|LVIS_SELECTED);
+					ListView_SetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex-1);
+					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex-1,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED);
+					ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount);
+					RWfileChanged=true;
+					return true;
+				}
+				case IDC_C_WATCH_DOWN:
+				{
+					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
+					if (watchIndex >= WatchCount - 1 || watchIndex == -1)
+						return true;
+					void *tmp = malloc(sizeof(AddressWatcher));
+					memcpy(tmp,&(rswatches[watchIndex]),sizeof(AddressWatcher));
+					memcpy(&(rswatches[watchIndex]),&(rswatches[watchIndex + 1]),sizeof(AddressWatcher));
+					memcpy(&(rswatches[watchIndex + 1]),tmp,sizeof(AddressWatcher));
+					free(tmp);
+					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex,0,LVIS_FOCUSED|LVIS_SELECTED);
+					ListView_SetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex+1);
+					ListView_SetItemState(GetDlgItem(hDlg,IDC_WATCHLIST),watchIndex+1,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED);
+					ListView_SetItemCount(GetDlgItem(hDlg,IDC_WATCHLIST),WatchCount);
+					RWfileChanged=true;
+					return true;
+				}
+				case ID_WATCHES_UPDOWN:
+				{
+					int delta = ((LPNMUPDOWN)lParam)->iDelta;
+					SendMessage(hDlg, WM_COMMAND, delta<0 ? IDC_C_WATCH_UP : IDC_C_WATCH_DOWN,0);
+					break;
+				}
+				case RAMMENU_FILE_AUTOLOAD:
+				{
+					AutoRWLoad ^= 1;
+					CheckMenuItem(ramwatchmenu, RAMMENU_FILE_AUTOLOAD, AutoRWLoad ? MF_CHECKED : MF_UNCHECKED);
+					//regSetDwordValue(AUTORWLOAD, AutoRWLoad); TODO
+					break;
+				}
+				case RAMMENU_FILE_SAVEWINDOW:
+				{
+					RWSaveWindowPos ^=1;
+					CheckMenuItem(ramwatchmenu, RAMMENU_FILE_SAVEWINDOW, RWSaveWindowPos ? MF_CHECKED : MF_UNCHECKED);
+					//regSetDwordValue(RWSAVEPOS, RWSaveWindowPos); TODO
+					break;
+				}
+				case IDC_C_ADDCHEAT:
+				{
+					watchIndex = ListView_GetSelectionMark(GetDlgItem(hDlg,IDC_WATCHLIST));
+					if(watchIndex >= 0)
+					{
+						unsigned int address = rswatches[watchIndex].Address;
+
+						int sizeType = -1;
+						if(rswatches[watchIndex].Size == 'b')
+							sizeType = 0;
+						else if(rswatches[watchIndex].Size == 'w')
+							sizeType = 1;
+						else if(rswatches[watchIndex].Size == 'd')
+							sizeType = 2;
+
+						int numberType = -1;
+						if(rswatches[watchIndex].Type == 's')
+							numberType = 0;
+						else if(rswatches[watchIndex].Type == 'u')
+							numberType = 1;
+						else if(rswatches[watchIndex].Type == 'h')
+							numberType = 2;
+
+						// Don't open cheat dialog
+
+						switch (sizeType) {
+						case 0: {
 								FCEUI_AddCheat("",address,rswatches[watchIndex].CurValue,-1,1);
 								break; }
-						case 1: {
+						case 1: {
 								FCEUI_AddCheat("",address,rswatches[watchIndex].CurValue & 0xFF,-1,1);
 								FCEUI_AddCheat("",address + 1,(rswatches[watchIndex].CurValue & 0xFF00) / 0x100,-1,1);
 								break; }
-						case 2: {
+						case 2: {
 								FCEUI_AddCheat("",address,rswatches[watchIndex].CurValue & 0xFF,-1,1);
 								FCEUI_AddCheat("",address + 1,(rswatches[watchIndex].CurValue & 0xFF00) / 0x100,-1,1);
 								FCEUI_AddCheat("",address + 2,(rswatches[watchIndex].CurValue & 0xFF0000) / 0x10000,-1,1);
@@ -1214,55 +1232,55 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 								break; }
 						}
 
-						UpdateCheatsAdded();
-					}
-				}
-				break;
-				case IDOK:
-				case IDCANCEL:
-					RamWatchHWnd = NULL;
-					DragAcceptFiles(hDlg, FALSE);
-					EndDialog(hDlg, true);
-					return true;
-				default:
-					if (LOWORD(wParam) >= RW_MENU_FIRST_RECENT_FILE && LOWORD(wParam) < RW_MENU_FIRST_RECENT_FILE+MAX_RECENT_WATCHES && LOWORD(wParam) <= RW_MENU_LAST_RECENT_FILE)
-					OpenRWRecentFile(LOWORD(wParam) - RW_MENU_FIRST_RECENT_FILE);
-			}
-			break;
-
-		case WM_KEYDOWN: // handle accelerator keys
-		{
-			SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
-			MSG msg;
-			msg.hwnd = hDlg;
-			msg.message = uMsg;
-			msg.wParam = wParam;
-			msg.lParam = lParam;
-			if(RamWatchAccels && TranslateAccelerator(hDlg, RamWatchAccels, &msg))
-				return true;
-		}	break;
-
-//		case WM_CLOSE:
-//			RamWatchHWnd = NULL;
-//			DragAcceptFiles(hDlg, FALSE);
-//			DestroyWindow(hDlg);
-//			return false;
-
-		case WM_DESTROY:
-			// this is the correct place
-			RamWatchHWnd = NULL;
-			DragAcceptFiles(hDlg, FALSE);
-			WriteRecentRWFiles();	// write recent menu to ini
-			break;
-
-		case WM_DROPFILES:
-		{
-			HDROP hDrop = (HDROP)wParam;
-			DragQueryFile(hDrop, 0, Str_Tmp, 1024);
-			DragFinish(hDrop);
-			return Load_Watches(true, Str_Tmp);
-		}	break;
-	}
-
-	return false;
-}
+						UpdateCheatsAdded();
+					}
+				}
+				break;
+				case IDOK:
+				case IDCANCEL:
+					RamWatchHWnd = NULL;
+					DragAcceptFiles(hDlg, FALSE);
+					EndDialog(hDlg, true);
+					return true;
+				default:
+					if (LOWORD(wParam) >= RW_MENU_FIRST_RECENT_FILE && LOWORD(wParam) < RW_MENU_FIRST_RECENT_FILE+MAX_RECENT_WATCHES && LOWORD(wParam) <= RW_MENU_LAST_RECENT_FILE)
+					OpenRWRecentFile(LOWORD(wParam) - RW_MENU_FIRST_RECENT_FILE);
+			}
+			break;
+
+		case WM_KEYDOWN: // handle accelerator keys
+		{
+			SetFocus(GetDlgItem(hDlg,IDC_WATCHLIST));
+			MSG msg;
+			msg.hwnd = hDlg;
+			msg.message = uMsg;
+			msg.wParam = wParam;
+			msg.lParam = lParam;
+			if(RamWatchAccels && TranslateAccelerator(hDlg, RamWatchAccels, &msg))
+				return true;
+		}	break;
+
+//		case WM_CLOSE:
+//			RamWatchHWnd = NULL;
+//			DragAcceptFiles(hDlg, FALSE);
+//			DestroyWindow(hDlg);
+//			return false;
+
+		case WM_DESTROY:
+			// this is the correct place
+			RamWatchHWnd = NULL;
+			DragAcceptFiles(hDlg, FALSE);
+			WriteRecentRWFiles();	// write recent menu to ini
+			break;
+
+		case WM_DROPFILES:
+		{
+			HDROP hDrop = (HDROP)wParam;
+			DragQueryFile(hDrop, 0, Str_Tmp, 1024);
+			DragFinish(hDrop);
+			return Load_Watches(true, Str_Tmp);
+		}	break;
+	}
+
+	return false;
+}
diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index fc7314ab..cfab308a 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -1427,8 +1427,8 @@ BEGIN
     RTEXT           "Marker 99999",IDC_SELECTION_MARKER,4,335,60,10,SS_NOTIFY,WS_EX_RIGHT
     CONTROL         "",IDC_BRANCHES_BITMAP,"Static",SS_OWNERDRAW | SS_NOTIFY | SS_REALSIZEIMAGE | NOT WS_VISIBLE,202,178,113,89
     CONTROL         " Turbo seek",CHECK_TURBO_SEEK,"Button",BS_AUTOCHECKBOX,263,25,50,12
-    LTEXT           "Selection: 0 rows, 16 columns",IDC_TEXT_SELECTION,204,118,112,10
-    LTEXT           "Clipboard: 0 rows, 16 columns",IDC_TEXT_CLIPBOARD,203,128,114,10
+    LTEXT           "Selection: 0 rows, 16 columns",IDC_TEXT_SELECTION,204,118,112,10,SS_NOTIFY
+    LTEXT           "Clipboard: 0 rows, 16 columns",IDC_TEXT_CLIPBOARD,203,128,114,10,SS_NOTIFY
     CONTROL         " Recording",IDC_RECORDING,"Button",BS_AUTO3STATE,203,71,64,10
     PUSHBUTTON      "Run function",TASEDITOR_RUN_MANUAL,202,150,54,14,WS_DISABLED | NOT WS_TABSTOP
     CONTROL         "Auto function",IDC_RUN_AUTO,"Button",BS_AUTOCHECKBOX,261,152,55,10
diff --git a/src/drivers/win/taseditor/taseditor_window.cpp b/src/drivers/win/taseditor/taseditor_window.cpp
index 72fc310f..0c370fb0 100644
--- a/src/drivers/win/taseditor/taseditor_window.cpp
+++ b/src/drivers/win/taseditor/taseditor_window.cpp
@@ -163,13 +163,13 @@ Window_items_struct window_items[TASEDITOR_WINDOW_TOTAL_ITEMS] = {
 	TASEDITOR_FIND_NEXT_SIMILAR_MARKER, -1, -1, 0, -1, "Continue Auto-search", "", false, 0, 0,
 	TASEDITOR_NEXT_MARKER, -1, -1, 0, -1, "Send Selection to next Marker (mouse: Ctrl+Wheel up) (hotkey: Ctrl+PageDown)", "", false, 0, 0,
 	IDC_PLAYBACK_MARKER_EDIT, 0, 0, -1, 0, "Click to edit text", "", false, 0, 0,
-	IDC_PLAYBACK_MARKER, 0, 0, 0, 0, "Click here to scroll Piano Roll to Playback cursor (hotkey: tap Shift twice)", "", true, 0, 0,
+	IDC_PLAYBACK_MARKER, 0, 0, 0, 0, "Click here to scroll Piano Roll to Playback cursor (hotkey: tap Shift twice)", "", false, 0, 0,
 	IDC_SELECTION_MARKER_EDIT, 0, -1, -1, -1, "Click to edit text", "", false, 0, 0,
-	IDC_SELECTION_MARKER, 0, -1, 0, -1, "Click here to scroll Piano Roll to Selection (hotkey: tap Ctrl twice)", "", true, 0, 0,
-	IDC_BRANCHES_BITMAP, -1, 0, 0, 0, "Click on a Bookmark to send Playback cursor there, double-click to load its Branch", "", false, 0, 0,
+	IDC_SELECTION_MARKER, 0, -1, 0, -1, "Click here to scroll Piano Roll to Selection (hotkey: tap Ctrl twice)", "", false, 0, 0,
+	IDC_BRANCHES_BITMAP, -1, 0, 0, 0, "Right click = set Bookmark, single Left click = jump to Bookmark, double Left click = load Branch", "", false, 0, 0,
 	CHECK_TURBO_SEEK, -1, 0, 0, 0, "Uncheck when you need to watch seeking in slow motion", "", false, 0, 0,
-	IDC_TEXT_SELECTION, -1, 0, 0, 0, "Current size of Selection", "", true, 0, 0,
-	IDC_TEXT_CLIPBOARD, -1, 0, 0, 0, "Current size of Input in the Clipboard", "", true, 0, 0,
+	IDC_TEXT_SELECTION, -1, 0, 0, 0, "Current size of Selection", "", false, 0, 0,
+	IDC_TEXT_CLIPBOARD, -1, 0, 0, 0, "Current size of Input in the Clipboard", "", false, 0, 0,
 	IDC_RECORDING, -1, 0, 0, 0, "Switch Input Recording on/off", "", false, EMUCMD_MOVIE_READONLY_TOGGLE, 0,
 	TASEDITOR_RUN_MANUAL, -1, 0, 0, 0, "Press the button to execute Lua Manual Function", "", false, 0, 0,
 	IDC_RUN_AUTO, -1, 0, 0, 0, "Enable Lua Auto Function (but first it must be registered by Lua script)", "", false, 0, 0,
@@ -209,7 +209,6 @@ void TASEDITOR_WINDOW::init()
 	{
 		if (window_items[i].tooltip_text_base[0])
 		{
-			// Create the tooltip. g_hInst is the global instance handle
 			window_items[i].tooltip_hwnd = CreateWindowEx(NULL, TOOLTIPS_CLASS, NULL,
 									  WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON,
 									  CW_USEDEFAULT, CW_USEDEFAULT,
@@ -255,15 +254,15 @@ void TASEDITOR_WINDOW::init()
 				{
 					toolInfo.lpszText = window_items[i].tooltip_text_base;
 				}
-				SendMessage(window_items[i].tooltip_hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolInfo);
-				SendMessage(window_items[i].tooltip_hwnd, TTM_SETDELAYTIME, TTDT_AUTOPOP, TOOLTIPS_AUTOPOP_TIMEOUT);
+				x = SendMessage(window_items[i].tooltip_hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolInfo);
+				x = SendMessage(window_items[i].tooltip_hwnd, TTM_SETDELAYTIME, TTDT_AUTOPOP, TOOLTIPS_AUTOPOP_TIMEOUT);
 			}
 		}
 	}
 	UpdateTooltips();
 	// subclass "Marker X" text fields
-	IDC_PLAYBACK_MARKER_oldWndProc = (WNDPROC)SetWindowLong(GetDlgItem(hwndTasEditor, IDC_PLAYBACK_MARKER), GWL_WNDPROC, (LONG)IDC_PLAYBACK_MARKER_WndProc);
-	IDC_SELECTION_MARKER_oldWndProc = (WNDPROC)SetWindowLong(GetDlgItem(hwndTasEditor, IDC_SELECTION_MARKER), GWL_WNDPROC, (LONG)IDC_SELECTION_MARKER_WndProc);
+	//IDC_PLAYBACK_MARKER_oldWndProc = (WNDPROC)SetWindowLong(GetDlgItem(hwndTasEditor, IDC_PLAYBACK_MARKER), GWL_WNDPROC, (LONG)IDC_PLAYBACK_MARKER_WndProc);
+	//IDC_SELECTION_MARKER_oldWndProc = (WNDPROC)SetWindowLong(GetDlgItem(hwndTasEditor, IDC_SELECTION_MARKER), GWL_WNDPROC, (LONG)IDC_SELECTION_MARKER_WndProc);
 	// subclass all buttons
 	IDC_PROGRESS_BUTTON_oldWndProc = (WNDPROC)SetWindowLong(GetDlgItem(hwndTasEditor, IDC_PROGRESS_BUTTON), GWL_WNDPROC, (LONG)IDC_PROGRESS_BUTTON_WndProc);
 	IDC_BRANCHES_BUTTON_oldWndProc = (WNDPROC)SetWindowLong(GetDlgItem(hwndTasEditor, IDC_BRANCHES_BUTTON), GWL_WNDPROC, (LONG)IDC_BRANCHES_BUTTON_WndProc);