diff --git a/ADApp/Db/NDFile.template b/ADApp/Db/NDFile.template
index a9b70a8..99c6bc7 100644
--- a/ADApp/Db/NDFile.template
+++ b/ADApp/Db/NDFile.template
@@ -18,7 +18,6 @@ record(waveform, "$(P)$(R)FilePath")
 
 record(waveform, "$(P)$(R)FilePath_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynOctetRead")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_PATH")
     field(FTVL, "UCHAR")
@@ -38,7 +37,6 @@ record(waveform, "$(P)$(R)FileName")
 
 record(waveform, "$(P)$(R)FileName_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynOctetRead")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_NAME")
     field(FTVL, "UCHAR")
@@ -50,14 +48,13 @@ record(waveform, "$(P)$(R)FileName_RBV")
 record(longout, "$(P)$(R)FileNumber")
 {
     field(PINI, "1")
-    field(VAL,  "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_NUMBER")
+    field(VAL,  "1")
 }
 
 record(longin, "$(P)$(R)FileNumber_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_NUMBER")
     field(SCAN, "I/O Intr")
@@ -76,6 +73,7 @@ record(mbbo, "$(P)$(R)AutoIncrement")
     field(PINI, "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))AUTO_INCREMENT")
+    field(VAL,  "1")
     field(ZRST, "No")
     field(ZRVL, "0")
     field(ONST, "Yes")
@@ -97,7 +95,7 @@ record(mbbo, "$(P)$(R)AutoIncrement_RBV")
 record(waveform, "$(P)$(R)FileTemplate")
 {
     field(PINI,  "1")
-    field(DTYP, "asynOctetWrite")
+    field(DTYP,  "asynOctetWrite")
     field(INP,   "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_TEMPLATE")
     field(FTVL, "UCHAR")
     field(NELM, "256")
@@ -105,7 +103,6 @@ record(waveform, "$(P)$(R)FileTemplate")
 
 record(waveform, "$(P)$(R)FileTemplate_RBV")
 {
-    field(PINI,  "1")
     field(DTYP, "asynOctetRead")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_TEMPLATE")
     field(FTVL, "UCHAR")
@@ -116,7 +113,6 @@ record(waveform, "$(P)$(R)FileTemplate_RBV")
 # Full filename, including path
 record(waveform, "$(P)$(R)FullFileName_RBV")
 {
-    field(PINI,  "1")
     field(DTYP, "asynOctetRead")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FULL_FILE_NAME")
     field(FTVL, "UCHAR")
@@ -130,6 +126,7 @@ record(mbbo, "$(P)$(R)AutoSave")
     field(PINI, "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))AUTO_SAVE")
+    field(VAL,  "1")
     field(ZRST, "No")
     field(ZRVL, "0")
     field(ONST, "Yes")
@@ -138,7 +135,6 @@ record(mbbo, "$(P)$(R)AutoSave")
 
 record(mbbi, "$(P)$(R)AutoSave_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))AUTO_SAVE")
     field(ZRST, "No")
@@ -169,6 +165,7 @@ record(mbbo, "$(P)$(R)FileFormat")
     field(PINI, "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_FORMAT")
+    field(VAL,  "0")
     field(ZRST, "netCDF")
     field(ZRVL, "0")
     field(ONST, "Invalid")
@@ -177,7 +174,6 @@ record(mbbo, "$(P)$(R)FileFormat")
 
 record(mbbi, "$(P)$(R)FileFormat_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FILE_FORMAT")
     field(ZRST, "netCDF")
@@ -193,6 +189,7 @@ record(mbbo, "$(P)$(R)FileWriteMode")
     field(PINI, "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))WRITE_MODE")
+    field(VAL,  "0")
     field(ZRST, "Single")
     field(ZRVL, "0")
     field(ONST, "Capture")
@@ -203,7 +200,6 @@ record(mbbo, "$(P)$(R)FileWriteMode")
 
 record(mbbi, "$(P)$(R)FileWriteMode_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))WRITE_MODE")
     field(ZRST, "Single")
@@ -225,7 +221,6 @@ record(longout, "$(P)$(R)Capture")
 
 record(longin, "$(P)$(R)Capture_RBV")
 {
-    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))CAPTURE")
     field(SCAN, "I/O Intr")
@@ -234,14 +229,13 @@ record(longin, "$(P)$(R)Capture_RBV")
 record(longout, "$(P)$(R)NumCapture")
 {
     field(PINI, "1")
-    field(VAL,  "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NUM_CAPTURE")
+    field(VAL,  "1")
 }
 
 record(longin, "$(P)$(R)NumCapture_RBV")
 {
-#    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NUM_CAPTURE")
     field(SCAN, "I/O Intr")
@@ -249,7 +243,6 @@ record(longin, "$(P)$(R)NumCapture_RBV")
 
 record(longin, "$(P)$(R)NumCaptured_RBV")
 {
-    field(PINI, "1")
     field(DTYP, "asynInt32")
     field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))NUM_CAPTURED")
     field(SCAN, "I/O Intr")