diff --git a/fst.equ b/fst.equ
index 43c0982..4872e07 100644
--- a/fst.equ
+++ b/fst.equ
@@ -10,7 +10,7 @@ my_fcr          	ds.l 1
 call_class      	ds.w 1
 
 
-device			ds.w 1 ; device for id_disk.
+;device			ds.w 1 ; device for id_disk.
 tool_error		ds.w 1
 
 
diff --git a/get_dir_entry.aii b/get_dir_entry.aii
index 21883ba..957c751 100644
--- a/get_dir_entry.aii
+++ b/get_dir_entry.aii
@@ -230,8 +230,9 @@ init	proc
 
 	with fst_parms,dp,data
 
-	lda device
-	sta dev_parms.dev_num
+	; must be set up before hand.
+	;lda device
+	;sta dev_parms.dev_num
 
 	; directory entry (and inode lookup) should be cached.
 	lda #in_cache
diff --git a/get_file_info.aii b/get_file_info.aii
index 22df0ce..23b9a47 100644
--- a/get_file_info.aii
+++ b/get_file_info.aii
@@ -168,8 +168,9 @@ load_inode	procname export
 	sta dev_req_cnt
 	sta dev_blk_size
 
-	lda device
-	sta dev_num
+	; dev_num must already be set up.
+	;lda device ;;;;
+	;sta dev_num
 
 	jsr device_read
 	bcc ok
@@ -266,7 +267,7 @@ no_path
 
 	lda dev_num
 	beq bps
-	sta device
+	;sta device
 	jmp id_disk
 	; returns
 bps
@@ -296,7 +297,7 @@ check_path
 
 	lda dev_num
 	beq bps
-	sta device
+	;sta device
 	jsr id_disk
 	bcs exit
 	lda #2
@@ -547,6 +548,8 @@ no_vcr
 @error
 	sec
 	rts
+device
+	ds.w 1
 	endp
 
 vstrcmp	procname
diff --git a/id_disk.aii b/id_disk.aii
index 6fbb481..4fab5ba 100644
--- a/id_disk.aii
+++ b/id_disk.aii
@@ -158,7 +158,8 @@ build_vcr	procname
 	and #vcr_swapped_in
 	sta [my_vcr],y
 
-	lda device
+	;lda device
+	lda dev_parms.dev_num
 	ldy #vcr.device
 	sta [my_vcr],y
 
diff --git a/main.aii b/main.aii
index 67fa304..d4b8ca3 100644
--- a/main.aii
+++ b/main.aii
@@ -222,7 +222,7 @@ app_entry	procname
 	sta dev_parms.dev_fst_num
 
 	stz <tool_error
-	stz <device
+	;stz <device
 
 	; fake an rtl address for sys_exit
 	; otherwise, would need to jml sys_exit from functions.
@@ -349,7 +349,7 @@ init_vcr proc export
 
 	ldy #vcr.device
 	lda [my_vcr]
-	sta device ; should probably just store in the dev_num.
+	;sta device ; should probably just store in the dev_num.
 	sta dev_parms.dev_num
 
 	clc