diff --git a/rosapps/cmd/cmd.c b/rosapps/cmd/cmd.c
index d6c7dbd6e18..7651c5fb1ea 100644
--- a/rosapps/cmd/cmd.c
+++ b/rosapps/cmd/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.26 2001/05/06 17:12:44 cnettel Exp $
+/* $Id: cmd.c,v 1.27 2001/06/18 02:55:47 phreak Exp $
  *
  *  CMD.C - command-line interface.
  *
@@ -226,21 +226,17 @@ Execute (LPTSTR first, LPTSTR rest)
 	else
 	{
 		/* exec the program */
-#ifndef __REACTOS__
 		TCHAR szFullCmdLine [CMDLINE_LENGTH];
-#endif
 		PROCESS_INFORMATION prci;
 		STARTUPINFO stui;
 
 #ifdef _DEBUG
 		DebugPrintf ("[EXEC: %s %s]\n", szFullName, rest);
 #endif
-#ifndef __REACTOS__
 		/* build command line for CreateProcess() */
-		_tcscpy (szFullCmdLine, szFullName);
+		_tcscpy (szFullCmdLine, first);
 		_tcscat (szFullCmdLine, _T(" "));
 		_tcscat (szFullCmdLine, rest);
-#endif
 
 		/* fill startup info */
 		memset (&stui, 0, sizeof (STARTUPINFO));
@@ -248,8 +244,11 @@ Execute (LPTSTR first, LPTSTR rest)
 		stui.dwFlags = STARTF_USESHOWWINDOW;
 		stui.wShowWindow = SW_SHOWDEFAULT;
 
-#ifndef __REACTOS__
-		if (CreateProcess (NULL,
+		// return console to standard mode
+		SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
+				  ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT );
+		
+		if (CreateProcess (szFullName,
 		                   szFullCmdLine,
 		                   NULL,
 		                   NULL,
@@ -259,18 +258,6 @@ Execute (LPTSTR first, LPTSTR rest)
 		                   NULL,
 		                   &stui,
 		                   &prci))
-#else
-		if (CreateProcess (szFullName,
-		                   rest,
-		                   NULL,
-		                   NULL,
-		                   FALSE,
-		                   0,
-		                   NULL,
-		                   NULL,
-		                   &stui,
-		                   &prci))
-#endif
 		{
 			/* FIXME: Protect this with critical section */
 			bChildProcessRunning = TRUE;
@@ -291,6 +278,9 @@ Execute (LPTSTR first, LPTSTR rest)
 			ErrorMessage (GetLastError (),
 			              "Error executing CreateProcess()!!\n");
 		}
+		// restore console mode
+		SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
+				ENABLE_PROCESSED_INPUT );
 	}
 
 #ifndef __REACTOS__
@@ -942,7 +932,6 @@ Initialize (int argc, char *argv[])
 	hOut = GetStdHandle (STD_OUTPUT_HANDLE);
 	hIn  = GetStdHandle (STD_INPUT_HANDLE);
 
-	SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT);
 
 	if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2))
 	{
@@ -957,6 +946,7 @@ Initialize (int argc, char *argv[])
 		               "  /T:bf       Sets the background/foreground color (see COLOR command)."));
 		ExitProcess (0);
 	}
+	SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT);
 
 #ifdef INCLUDE_CMD_CHDIR
 	InitLastPath ();
@@ -1140,6 +1130,8 @@ static VOID Cleanup (int argc, char *argv[])
 
 	/* remove ctrl break handler */
 	RemoveBreakHandler ();
+	SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
+			ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT );
 }
 
 
diff --git a/rosapps/cmd/start.c b/rosapps/cmd/start.c
index 3d34418dec4..5b465bbb409 100644
--- a/rosapps/cmd/start.c
+++ b/rosapps/cmd/start.c
@@ -24,6 +24,7 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
 {
 	TCHAR szFullName[MAX_PATH];
 	BOOL bWait = FALSE;
+	TCHAR *param;
 
 	if (_tcsncmp (rest, _T("/?"), 2) == 0)
 	{
@@ -49,15 +50,24 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
 
 		return 0;
 	}
-
+	if( !*rest )
+	  {
+	    // FIXME: use comspec instead
+	    rest = "cmd";
+	  }
 	/* get the PATH environment variable and parse it */
 	/* search the PATH environment variable for the binary */
-	if (!SearchForExecutable (first, szFullName))
+	param = strchr( rest, ' ' );  // skip program name to reach parameters
+	if( param )
+	  {
+	    *param = 0;
+	    param++;
+	  }
+	if (!SearchForExecutable (rest, szFullName))
 	{
 		error_bad_command ();
 		return 1;
 	}
-
 	/* check if this is a .BAT or .CMD file */
 	if (!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".bat")) ||
 		!_tcsicmp (_tcsrchr (szFullName, _T('.')), _T(".cmd")))
@@ -78,9 +88,12 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
 		DebugPrintf ("[EXEC: %s %s]\n", szFullName, rest);
 #endif
 		/* build command line for CreateProcess() */
-		_tcscpy (szFullCmdLine, szFullName);
-		_tcscat (szFullCmdLine, _T(" "));
-		_tcscat (szFullCmdLine, rest);
+		_tcscpy (szFullCmdLine, first);
+		if( param )
+		  {
+		    _tcscat(szFullCmdLine, " " );
+		    _tcscat (szFullCmdLine, param);
+		  }
 
 		/* fill startup info */
 		memset (&stui, 0, sizeof (STARTUPINFO));
@@ -88,8 +101,8 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
 		stui.dwFlags = STARTF_USESHOWWINDOW;
 		stui.wShowWindow = SW_SHOWDEFAULT;
 			
-		if (CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE,
-						   0, NULL, NULL, &stui, &prci))
+		if (CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE,
+						   CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci))
 		{
 			if (bWait)
 			{