diff --git a/reactos/apps/tests/test_old/makefile b/reactos/apps/tests/test_old/makefile
index cb8c8929c08..fbf0ac8ec1b 100644
--- a/reactos/apps/tests/test_old/makefile
+++ b/reactos/apps/tests/test_old/makefile
@@ -20,10 +20,10 @@ install: # $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe)
 $(PROGS:%=$(FLOPPY_DIR)/apps/%.exe): $(FLOPPY_DIR)/apps/%.exe: %.exe
 	$(CP) $*.exe $(FLOPPY_DIR)/apps/$*.exe
 
-dist: $(PROGS:%=../../$(DIST_DIR)/apps/%.exe)
+dist: $(PROGS:%=$(DIST_DIR)/apps/%.exe)
 
-$(PROGS:%=../../$(DIST_DIR)/apps/%.exe): ../../$(DIST_DIR)/apps/%.exe: %.exe
-	$(CP) $*.exe ../../$(DIST_DIR)/apps/$*.exe
+$(PROGS:%=$(DIST_DIR)/apps/%.exe): $(DIST_DIR)/apps/%.exe: %.exe
+	$(CP) $*.exe $(DIST_DIR)/apps/$*.exe
 
 bug2.exe: bug2.c
 	$(CC) bug2.c -lkernel32 -o bug2.exe
diff --git a/reactos/install-system.sh b/reactos/install-system.sh
index dc10123d08e..1791cf436ad 100644
--- a/reactos/install-system.sh
+++ b/reactos/install-system.sh
@@ -1,15 +1 @@
-mkdir -p $1/reactos
-mkdir -p $1/reactos/system32
-mkdir -p $1/reactos/system32/drivers
-mkdir -p $1/reactos/bin
-#cp fdisk.exe $1
-#cp format.exe $1
-cp loaders/dos/loadros.com $1
-cp ntoskrnl/ntoskrnl.exe $1
-cp services/fs/vfat/vfatfs.sys $1
-cp services/dd/ide/ide.sys $1
-cp services/fs/minix/minixfs.sys $1
-#cp services/dd/floppy/floppy.sys $1
-#cp ntoskrnl/ntoskrnl.exe $1/reactos/system32/
-#cp services/fs/vfat/vfatfs.sys $1/reactos/system32/drivers/
-#cp services/dd/ide/ide.sys $1/reactos/system32/drivers/
+cp -rv reactos $1/
diff --git a/reactos/install.sh b/reactos/install.sh
index 969eecdb218..345e63b4b25 100644
--- a/reactos/install.sh
+++ b/reactos/install.sh
@@ -1,54 +1 @@
-mkdir -p $1/reactos
-mkdir -p $1/reactos/system32
-mkdir -p $1/reactos/system32/drivers
-mkdir -p $1/reactos/bin
-mkdir -p $1/reactos/media
-mkdir -p $1/reactos/media/fonts
 ./install-system.sh $1
-cp services/bus/acpi/acpi.sys $1/reactos/system32/drivers
-cp services/bus/isapnp/isapnp.sys $1/reactos/system32/drivers
-cp services/dd/floppy/floppy.sys $1/reactos/system32/drivers/
-cp services/input/keyboard/keyboard.sys $1/reactos/system32/drivers
-cp services/dd/blue/blue.sys $1/reactos/system32/drivers
-cp services/dd/vga/miniport/vgamp.sys $1/reactos/system32/drivers
-cp services/dd/vga/display/vgaddi.dll $1/reactos/system32/drivers
-cp services/dd/vidport/vidport.sys $1/reactos/system32/drivers
-cp services/fs/minix/minixfs.sys $1/reactos/system32/drivers
-cp apps/system/shell/shell.exe $1/reactos/system32
-cp apps/system/winlogon/winlogon.exe $1/reactos/system32/
-cp apps/system/services/services.exe $1/reactos/system32/
-cp lib/ntdll/ntdll.dll $1/reactos/system32
-cp lib/kernel32/kernel32.dll $1/reactos/system32
-cp lib/crtdll/crtdll.dll $1/reactos/system32
-cp lib/fmifs/fmifs.dll $1/reactos/system32
-cp lib/gdi32/gdi32.dll $1/reactos/system32
-cp lib/advapi32/advapi32.dll $1/reactos/system32
-cp lib/user32/user32.dll $1/reactos/system32/
-cp apps/hello/hello.exe $1/reactos/bin
-cp apps/args/args.exe $1/reactos/bin
-cp apps/bench/bench-thread.exe $1/reactos/bin
-cp apps/cat/cat.exe $1/reactos/bin
-cp subsys/smss/smss.exe $1/reactos/system32
-cp subsys/csrss/csrss.exe $1/reactos/system32
-cp subsys/win32k/win32k.sys $1/reactos/system32/drivers
-cp apps/apc/apc.exe $1/reactos/bin
-cp apps/shm/shmsrv.exe $1/reactos/bin
-cp apps/shm/shmclt.exe $1/reactos/bin
-cp apps/lpc/lpcsrv.exe $1/reactos/bin
-cp apps/lpc/lpcclt.exe $1/reactos/bin
-cp apps/thread/thread.exe $1/reactos/bin
-cp apps/event/event.exe $1/reactos/bin
-cp apps/file/file.exe $1/reactos/bin
-cp apps/pteb/pteb.exe $1/reactos/bin
-cp apps/consume/consume.exe $1/reactos/bin
-cp apps/float/float.exe $1/reactos/bin
-cp apps/dump_shared_data/dump_shared_data.exe $1/reactos/bin
-cp apps/vmtest/vmtest.exe $1/reactos/bin
-cp apps/uitest/uitest.exe $1/reactos/bin/
-cp apps/gditest/gditest.exe $1/reactos/bin/
-cp apps/ptest/ptest.exe $1/reactos/bin/
-cp apps/timer/timer.exe $1/reactos/bin/
-cp apps/exp/exp.exe $1/reactos/bin/
-cp apps/alive/alive.exe $1/reactos/bin/
-cp media/fonts/helb____.ttf $1/reactos/media/fonts/
-cp media/fonts/timr____.ttf $1/reactos/media/fonts/
diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index faff974971b..034a328710b 100644
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: main.c,v 1.102 2001/08/21 20:13:09 chorns Exp $
+/* $Id: main.c,v 1.103 2001/09/01 11:55:37 dwelch Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/main.c
@@ -167,14 +167,14 @@ CreateSystemRootLink (PCSZ ParameterLine)
 	                                   &ObjectAttributes);
 	if (!NT_SUCCESS(Status))
 	{
-		RtlFreeUnicodeString (&BootPath);
-		RtlFreeUnicodeString (&DeviceName);
-		DPRINT("NtOpenSymbolicLinkObject() '%wZ' failed (Status %x)\n",
+	  RtlFreeUnicodeString (&BootPath);
+	  RtlFreeUnicodeString (&DeviceName);
+	  DPRINT1("NtOpenSymbolicLinkObject() '%wZ' failed (Status %x)\n",
 		         &ArcName,
 		         Status);
-		RtlFreeUnicodeString (&ArcName);
+	  RtlFreeUnicodeString (&ArcName);
 
-		KeBugCheck (0x0);
+	  KeBugCheck (0x0);
 	}
 	RtlFreeUnicodeString (&ArcName);
 
diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 9070b80e898..ba6f7edab81 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.6 2001/09/01 10:38:49 chorns Exp $
+# $Id: helper.mk,v 1.7 2001/09/01 11:55:38 dwelch Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -57,6 +57,7 @@ ifeq ($(TARGET_TYPE),program)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := bin
   MK_DISTDIR := apps
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -74,6 +75,7 @@ ifeq ($(TARGET_TYPE),proglib)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(SDK_PATH_LIB)
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := bin
   MK_DISTDIR := apps
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -91,6 +93,7 @@ ifeq ($(TARGET_TYPE),dynlink)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(SDK_PATH_LIB)
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32
   MK_DISTDIR := dlls
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -108,6 +111,7 @@ ifeq ($(TARGET_TYPE),library)
   MK_IMPLIB := no
   MK_IMPLIBONLY := yes
   MK_IMPLIBDEFPATH := $(SDK_PATH_LIB)
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := $(SDK_PATH_INC)
   MK_DISTDIR := # FIXME
   MK_RESOURCE := 
@@ -125,6 +129,7 @@ ifeq ($(TARGET_TYPE),driver_library)
   MK_IMPLIB := no
   MK_IMPLIBONLY := yes
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := $(DDK_PATH_INC)
   MK_DISTDIR := # FIXME
   MK_RESOURCE :=
@@ -142,6 +147,7 @@ ifeq ($(TARGET_TYPE),driver)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32/drivers
   MK_DISTDIR := drivers
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -159,6 +165,7 @@ ifeq ($(TARGET_TYPE),export_driver)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32/drivers
   MK_DISTDIR := drivers
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -176,6 +183,7 @@ ifeq ($(TARGET_TYPE),hal)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32
   MK_DISTDIR := dlls
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -193,6 +201,7 @@ ifeq ($(TARGET_TYPE),bootpgm)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32
   MK_DISTDIR := # FIXME
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -210,6 +219,7 @@ ifeq ($(TARGET_TYPE),miniport)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32/drivers
   MK_DISTDIR := drivers
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -228,6 +238,7 @@ ifeq ($(TARGET_TYPE),gdi_driver)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
+  MK_IMPLIB_EXT := .a
   MK_INSTALLDIR := system32/drivers
   MK_DISTDIR := drivers
   MK_RESOURCE := $(TARGET_PATH)/$(TARGET_NAME).coff
@@ -342,6 +353,7 @@ TARGET_NFLAGS += $(MK_NFLAGS)
 MK_GCCLIBS := $(addprefix -l, $(TARGET_GCCLIBS))
 
 MK_FULLNAME := $(MK_BASENAME)$(MK_EXT)
+MK_IMPLIB_FULLNAME := $(MK_BASENAME)$(MK_IMPLIB_EXT)
 
 MK_NOSTRIPNAME := $(MK_BASENAME).nostrip$(MK_EXT)
 
@@ -350,11 +362,11 @@ MK_OBJECTS := $(filter-out %.h,$(TARGET_OBJECTS))
 
 ifeq ($(MK_IMPLIBONLY),yes)
 
-TARGET_CLEAN += $(MK_IMPLIBPATH)/$(MK_FULLNAME)
+TARGET_CLEAN += $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME)
 
-all: $(MK_IMPLIBPATH)/$(MK_FULLNAME)
+all: $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME)
 
-$(MK_IMPLIBPATH)/$(MK_FULLNAME): $(TARGET_OBJECTS)
+$(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME): $(TARGET_OBJECTS)
 	$(DLLTOOL) \
 		--dllname $(MK_FULLNAME) \
 		--def $(MK_DEFNAME) \