diff --git a/progmgr/group.c b/progmgr/group.c
index 1552292..70076d4 100644
--- a/progmgr/group.c
+++ b/progmgr/group.c
@@ -370,7 +370,8 @@ VOID UpdateGroup(_In_ PGROUP pg)
 	// Set the group checksum
 	pg->wChecksum = 1; // NOTE: implement this for real later lol
 
-	pg->dwFlags = GRP_FLAG_MAXIMIZED;// GetGroupFlags(pgw);
+	// TODO: set group flags
+	// pg->dwFlags = GRP_FLAG_MAXIMIZED;// GetGroupFlags(pgw);
 
 	// Set FILETIME
 	GetSystemTimeAsFileTime(&pg->ftLastWrite);
diff --git a/progmgr/group.h b/progmgr/group.h
index f361485..68768be 100644
--- a/progmgr/group.h
+++ b/progmgr/group.h
@@ -27,9 +27,10 @@
 #define GRP_FLAG_MINIMIZED 0x00000004
 #define GRP_FLAG_MAXIMIZED 0x00000008
 // Item Flag Values (DWORD)
-#define ITM_FLAG_MINIMIZED 0x00000001
-#define ITM_FLAG_MAXIMIZED 0x00000002
-#define ITM_FLAG_PRIVILEGE 0x00000004
+#define ITM_FLAG_HOTKEY 0x00000001
+#define ITM_FLAG_PRIVILEGE 0x00000002
+#define ITM_FLAG_MINIMIZED 0x00000004
+#define ITM_FLAG_MAXIMIZED 0x00000008
 
 /* Structures */
 // Item Structure
diff --git a/progmgr/wndproc.c b/progmgr/wndproc.c
index 6f5efdb..cec2fdd 100644
--- a/progmgr/wndproc.c
+++ b/progmgr/wndproc.c
@@ -52,14 +52,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 				return 0;
 		}
 
-		goto WndProcDefault;
+		return DefFrameProc(hWnd, hWndMDIClient, message, wParam, lParam);
 	}
 
 	case WM_COMMAND:
 		if (CmdProc(hWnd, wParam, lParam))
 			return 0;
 
-		goto WndProcDefault;
+		return DefFrameProc(hWnd, hWndMDIClient, message, wParam, lParam);
 
 	case WM_CLOSE:
 		if (bSaveSettings)
@@ -76,7 +76,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 
 	default:
-	WndProcDefault:
 		return DefFrameProc(hWnd, hWndMDIClient, message, wParam, lParam);
 	}
 	return 0;