diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 280bb937..d689ca01 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SH.S.CORE.txt b/BIN/SH.S.CORE.txt
index c9634a19..ab00e5e5 100644
--- a/BIN/SH.S.CORE.txt
+++ b/BIN/SH.S.CORE.txt
@@ -403,12 +403,10 @@ CORE.ArgV.Dup	>STYA ZPPtr1
 				
 				>STYA ZPPtr2
 
-				lda #$ff				Arg count-1 (skip $0)
-				pha
+				phx
+				ldx #$ff				Arg count-1 (skip $0)
 				
-.5				pla
-				inc
-				pha
+.5				inx
 				
 				jsr StrCpyPtr1Ptr2
 				tya
@@ -418,7 +416,9 @@ CORE.ArgV.Dup	>STYA ZPPtr1
 				jsr AddYp1Ptr1
 				bra .5
 
-.8				pla						A = Arg count, X = hARGV
+.8				txa						A = Arg count, X = hARGV
+				plx
+				
 				clc				
 .9				rts				
 *--------------------------------------
diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt
index a69866df..b3df31e4 100644
--- a/DRV/DHGR.DRV.S.txt
+++ b/DRV/DHGR.DRV.S.txt
@@ -13,7 +13,7 @@ NEW
 				.INB INC/GFX.I
 				.INB INC/GFX.EVE.I
 *--------------------------------------
-ZPPtr			.EQ ZPDRV
+ZPPtr			.EQ ZPBIN
 *--------------------------------------
 *			File Header (16 Bytes)
 *--------------------------------------
diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt
index aad8050c..28845123 100644
--- a/DRV/LANCEGS.DRV.S.txt
+++ b/DRV/LANCEGS.DRV.S.txt
@@ -12,7 +12,8 @@ NEW
 				.INB INC/NIC.91C96.I
 				.INB INC/ETH.I
 *--------------------------------------
-ZPArgPtr		.EQ ZPDRV
+ZPArgPtr		.EQ ZPBIN
+DEVSLOT0x		.EQ ZPBIN+2
 *--------------------------------------
 *			File Header (16 Bytes)
 *--------------------------------------
@@ -74,8 +75,7 @@ Dev.Detect		>STYA ARGS
 				rts
 				
 .3				stx DEVSLOTx0
-				lda #A2osX.S.NIC
-				sta A2osX.S,y
+				sty DEVSLOT0x
 
 				jsr Dev.ParseArgs
 				bcs .9
@@ -96,7 +96,13 @@ Dev.Detect		>STYA ARGS
 				>PUSHW L.FD.DEV.NAME
 				>LDYA L.FD.DEV
 				>SYSCALL MKDEV
-
+				bcs .9
+				
+				ldx DEVSLOT0x
+				lda #A2osX.S.NIC
+				sta A2osX.S,x
+				
+*				clc			
 .9				rts
 *--------------------------------------
 Dev.ParseArgs	>LDYA ARGS
diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt
index 1a604b8b..16be50d8 100644
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@@ -13,7 +13,7 @@ AUTO 4,1
 				.INB INC/XY.MOUSE.I
 				.INB INC/LIBGUI.I
 *--------------------------------------
-ZPSlotPtr		.EQ ZPDRV
+ZPSlotPtr		.EQ ZPBIN
 *--------------------------------------
 *			File Header (16 Bytes)
 *--------------------------------------
diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt
index c237094a..210838d5 100644
--- a/DRV/UTHERNET.DRV.S.txt
+++ b/DRV/UTHERNET.DRV.S.txt
@@ -12,8 +12,8 @@ NEW
 				.INB INC/NIC.8900A.I
 				.INB INC/ETH.I
 *--------------------------------------
-ZPArgPtr		.EQ ZPDRV
-DEVSLOT0x		.EQ ZPDRV+2
+ZPArgPtr		.EQ ZPBIN
+DEVSLOT0x		.EQ ZPBIN+2
 *--------------------------------------
 *			File Header (16 Bytes)
 *--------------------------------------
diff --git a/DRV/X.U2.DRV.S.txt b/DRV/X.U2.DRV.S.txt
index 5b41cdc7..12ee3557 100644
--- a/DRV/X.U2.DRV.S.txt
+++ b/DRV/X.U2.DRV.S.txt
@@ -9,7 +9,8 @@ NEW
 				.TF DRV/UTHERNET2.DRV
 				.FIN
 *--------------------------------------
-ZPArgPtr		.EQ ZPDRV
+ZPArgPtr		.EQ ZPBIN
+DEVSLOT0x		.EQ ZPBIN+2
 *--------------------------------------
 *			File Header (16 Bytes)
 *--------------------------------------
@@ -94,6 +95,7 @@ Dev.Detect		>STYA ARGS
 				rts
 				
 .3				stx DEVSLOTx0
+				sty DEVSLOT0x
 				lda #A2osX.S.NIC
 				sta A2osX.S,y
 				
@@ -116,7 +118,13 @@ Dev.Detect		>STYA ARGS
 				>PUSHW L.FD.DEV.NAME
 				>LDYA L.FD.DEV
 				>SYSCALL MKDEV
-
+				bcs .9
+				
+				ldx DEVSLOT0x
+				lda #A2osX.S.NIC
+				sta A2osX.S,x
+				
+*				clc
 .9				rts
 *--------------------------------------
 Dev.ParseArgs	>LDYA ARGS
diff --git a/SBIN/NETWORKD.S.txt b/SBIN/NETWORKD.S.txt
index 038d8db9..a12b6465 100644
--- a/SBIN/NETWORKD.S.txt
+++ b/SBIN/NETWORKD.S.txt
@@ -216,6 +216,7 @@ CS.INIT.CONF	>LDYAI 64
 CS.RUN			>PUSHW L.IOCTL
 				>PUSHBI IOCTL.READ
 				lda DevID
+	
 				>SYSCALL IOCTL
 				bcs .8					No Frame