diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
index a09fb4506..6b28d42c3 100644
--- a/src/engine/shared/console.cpp
+++ b/src/engine/shared/console.cpp
@@ -618,13 +618,16 @@ void CConsole::List(const int Level, int Flags)
 	while(pCommand)
 	{
 		if(pCommand)
-			if(pCommand->m_Level <= Level && pCommand->m_Flags&Flags)
+			if(pCommand->m_Level <= Level && (!Flags)?true:pCommand->m_Flags&Flags)
 			{
 				char aBuf[128];
-				str_format(aBuf,sizeof(aBuf),"%s, %s, %s",pCommand->m_pName, pCommand->m_pParams, pCommand->m_pHelp);
+				str_format(aBuf,sizeof(aBuf),"Name: %s, Parameters: %s, Help: %s",pCommand->m_pName, (!str_length(pCommand->m_pParams))?"None.":pCommand->m_pParams, (!str_length(pCommand->m_pHelp))?"No Help String Given":pCommand->m_pHelp);
 				PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "Console", aBuf);
+				for (int var = 0; var < 500; ++var)
+				{
+					;//do nothing
+				}
 			}
-
 		pCommand = pCommand->m_pNext;
 	}
 }
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 7dfce1692..101c7895b 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -1987,12 +1987,12 @@ void CGameContext::ConHelp(IConsole::IResult *pResult, void *pUserData, int Clie
 	}
 	else
 	{
-	const char *pArg = pResult->GetString(0);
-	IConsole::CCommandInfo *pCmdInfo = pSelf->Console()->GetCommandInfo(pArg, CFGFLAG_SERVER);
-	if(pCmdInfo && pCmdInfo->m_pHelp)
-		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", pCmdInfo->m_pHelp);
-	else
-			pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "Command is either unknown or you havent given the blank command without any parameters.");
+		const char *pArg = pResult->GetString(0);
+		IConsole::CCommandInfo *pCmdInfo = pSelf->Console()->GetCommandInfo(pArg, CFGFLAG_SERVER);
+		if(pCmdInfo && pCmdInfo->m_pHelp)
+			pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", pCmdInfo->m_pHelp);
+		else
+				pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "Command is either unknown or you have given a blank command without any parameters.");
 	}
 }