diff --git a/Cxbx.opt b/Cxbx.opt
index 7b41da281..3d1d28311 100644
Binary files a/Cxbx.opt and b/Cxbx.opt differ
diff --git a/Doc/Todo.txt b/Doc/Todo.txt
index f07f47de6..f1851b4a2 100644
--- a/Doc/Todo.txt
+++ b/Doc/Todo.txt
@@ -2,8 +2,6 @@ Cxbx Todo (* denotes high priority, + denotes medium priority)
 
 HLE :
 
-  * Fix hardware video mode
-
   * NSIS installer. Option to clear UDATA/TDATA/CxbxCache
 
   * Modularize inline vertex buffers (Begin()/End())
diff --git a/Source/Win32/CxbxKrnl/DbgConsole.cpp b/Source/Win32/CxbxKrnl/DbgConsole.cpp
index 6bf22ba44..47b75dcad 100644
--- a/Source/Win32/CxbxKrnl/DbgConsole.cpp
+++ b/Source/Win32/CxbxKrnl/DbgConsole.cpp
@@ -120,14 +120,14 @@ void DbgConsole::ParseCommand()
 
     // TODO: as command list grows, turn into static string/ptr lookup
 
-    if(stricmp(m_szInput, "help") == 0)
+    if(stricmp(m_szInput, "h") == 0 || stricmp(m_szInput, "help") == 0)
     {
         printf("CxbxDbg: \n");
         printf("CxbxDbg: Cxbx Debug Command List:\n");
         printf("CxbxDbg: \n");
-        printf("CxbxDbg:  HELP, H\n");
-        printf("CxbxDbg:  QUIT, Q, EXIT\n");
-        printf("CxbxDbg:  TRACE, T\n");
+        printf("CxbxDbg:  HELP  (H)\n");
+        printf("CxbxDbg:  QUIT  (Q or EXIT)\n");
+        printf("CxbxDbg:  TRACE (T)\n");
         printf("CxbxDbg:  CLS\n");
         printf("CxbxDbg: \n");
     }
diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
index cad900c86..36c73c67e 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
@@ -220,6 +220,8 @@ VOID XTL::EmuD3DInit(Xbe::Header *XbeHeader, uint32 XbeHeaderSize)
         g_pD3D8->GetDeviceCaps(g_XBVideo.GetDisplayAdapter(), DevType, &g_D3DCaps);
     }
 
+	SetFocus(g_hEmuWindow);
+
     // create default device
     {
         XTL::X_D3DPRESENT_PARAMETERS PresParam;