diff --git a/src/conddebug.cpp b/src/conddebug.cpp
index 442a55d3..9b339aaf 100644
--- a/src/conddebug.cpp
+++ b/src/conddebug.cpp
@@ -34,7 +34,7 @@
 * Primitive -> Number | Address | Register | Flag | PC Bank | '(' Connect ')'
 * Number    -> '#' [1-9A-F]*
 * Address   -> '$' [1-9A-F]* | '$' '[' Connect ']'
-* Register  -> 'A' | 'X' | 'Y' | 'R'
+* Register  -> 'A' | 'X' | 'Y' | 'P'
 * Flag      -> 'N' | 'C' | 'Z' | 'I' | 'B' | 'V'
 * PC Bank   -> 'K'
 */
diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp
index e74650d5..a07f95c4 100644
--- a/src/drivers/win/debugger.cpp
+++ b/src/drivers/win/debugger.cpp
@@ -298,7 +298,7 @@ BOOL CALLBACK AddbpCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 						case IDOK:
 							if (WP_edit >= 0) {
 								int tmp = NewBreakWindows(hwndDlg,WP_edit,(BOOL)(watchpoint[WP_edit].flags&WP_E));
-								if (tmp == INVALID_BREAKPOINT_CONDITION)
+								if (tmp == 2 || tmp == INVALID_BREAKPOINT_CONDITION)
 								{
 									MessageBox(hwndDlg, "Invalid breakpoint condition", "Error", MB_OK);
 									break;
diff --git a/src/drivers/win/help/fceux.chm b/src/drivers/win/help/fceux.chm
index 1a9b81d1..82719e2f 100644
Binary files a/src/drivers/win/help/fceux.chm and b/src/drivers/win/help/fceux.chm differ
diff --git a/vc/Help/fceux.hnd b/vc/Help/fceux.hnd
index 999e1df7..2963d3dd 100644
Binary files a/vc/Help/fceux.hnd and b/vc/Help/fceux.hnd differ