diff --git a/cmds/st.cmd b/cmds/st.cmd
index b9734d7788489319cb16deae5245c8608b799246..506cf413e84d24fe46de10d50af8f744c699c0fa 100644
--- a/cmds/st.cmd
+++ b/cmds/st.cmd
@@ -1,6 +1,9 @@
 # This should be a test startup script
+require rheometermcr702e
 
 epicsEnvSet("PREFIX", "SE-SEE:")
 epicsEnvSet("DEVICE", "SE-RHEO-001:")
+epicsEnvSet("IPADDR", "172.30.32.60")
+epicsEnvSet("PORT", "1025")
 
-iocshLoad("/home/jimlarsson/modules/rheometerMCR702e/iocsh/rheometer.iocsh", "PREFIX=$(PREFIX), DEVICE=$(DEVICE)")
+iocshLoad("$(rheometermcr702e_DIR)rheometer.iocsh", "P=$(PREFIX), R=$(DEVICE), IPADDR=$(IPADDR), PORT=$(PORT)")
diff --git a/iocsh/rheometer.iocsh b/iocsh/rheometer.iocsh
index 573968f5eee960d340b3baf56939ebe7ed57d401..ee99daf3a9606ac7c9b4a6bdf7e4a73928487c57 100644
--- a/iocsh/rheometer.iocsh
+++ b/iocsh/rheometer.iocsh
@@ -3,12 +3,22 @@
 #   iocshLoad("$(rheotest_DIR)/rheotest.iocsh")
 require rheometermcr702e
 
-epicsEnvSet("STREAM_PROTOCOL_PATH", "$(rheometermcr702e_DIR)/db")
+epicsEnvSet("PORTNAME", "rheo")
+epicsEnvSet("IPADDR", "$(IPADqDR)")
+epicsEnvSet("PORT", "$(PORT)")
+epicsEnvSet("P", "$(P)")
+epicsEnvSet("R", "$(R)")
+
+
+
+epicsEnvSet("STREAM_PROTOCOL_PATH", "$(rheometermcr702e_DIR)db/")
+epicsEnvSet("EPICS_DB_INCLUDE_PATH", "$(rheometermcr702e_DIR)db/")
 #drvAsynIPPortConfigure("rheo", "127.0.0.1:5555")
 
-drvAsynIPPortConfigure("rheo", "172.30.32.60:1025")
+#drvAsynIPPortConfigure("rheo", "172.30.32.60:1025")
+drvAsynIPPortConfigure("$(PORTNAME)", "$(IPADDR):$(PORT)")
 
-dbLoadRecords("rheo_comm.db", "P=$(PREFIX), R=$(DEVICE)")
+dbLoadRecords("rheo_comm.db", "P=$(P), R=$(R)")
 
 iocInit()
 
diff --git a/rheometerApp/Db/rheo_comm.db b/rheometerApp/Db/rheo_comm.db
index 45cf9a736fe879258dbde55a0a475f9f19894b08..17b159559e3dfab78f93769036c7a7bc3266d355 100644
--- a/rheometerApp/Db/rheo_comm.db
+++ b/rheometerApp/Db/rheo_comm.db
@@ -8,10 +8,10 @@ record(ai, "$(P)$(R)InError"){
 record(calc, "$(P)$(R)CheckAirPressure") {
 	field(INPA, "$(P)$(R)InError NPP")
 	field(CALC, "(A = 9311) ? 1 : 0")
-	field(FLNK, "$(P)(R)ErrorAirPres")
+	field(FLNK, "$(P)(R)ErrorAirPres.PROC")
 }
 
-record(bi, "$(P)(R)ErrorAirPressure") {
+record(bi, "$(P)$(R)ErrorAirPressure") {
 	field(INP, "$(P)$(R)CheckAirPressure NPP")
 	field(ZNAM, "Ok")
 	field(ONAM, "No Air Pressure!")
@@ -169,7 +169,7 @@ record(ai, "$(P)$(R)FreqInterval_Start-S") {
 	field(DESC, "")
 	field(VAL, "0.0001")
 	field(EGU, "fraction")
-	field(FLNK, "$(P)$(R)FreqInterval_Start-RB")
+	field(FLNK, "$(P)$(R)FreqInterval_Start-RB.PROC")
 }
 
 record(ai, "$(P)$(R)FreqInterval_Start-RB") {
@@ -181,7 +181,7 @@ record(ai, "$(P)$(R)FreqInterval_End-S") {
 	field(DESC, "")
 	field(VAL, "1")
 	field(EGU, "fraction")
-	field(FLNK, "$(P)$(R)FreqInterval_End-RB")
+	field(FLNK, "$(P)$(R)FreqInterval_End-RB.PROC")
 }
 
 record(ai, "$(P)$(R)FreqInterval_End-RB") {
@@ -201,14 +201,14 @@ record(ai, "$(P)$(R)FreqPeriod-RB") {
 	field(PINI, "YES")
 }
 
-record(longin, "$(P)(R)MeasPoints-S"){
+record(longin, "$(P)$(R)MeasPoints-S"){
 	field(DESC, "Number of measurement points.")
 	field(VAL, "5")	
-	field(FLNK, "$(P)$(R)npoints-RB")
+	field(FLNK, "$(P)$(R)MeasPoints-RB.PROC")
 }
 
 record(longin, "$(P)$(R)MeasPoints-RB") {
-	field(INP, "$(P)(R)npoints-S NPP")
+	field(INP, "$(P)$(R)MeasPoints-S NPP")
 	field(PINI, "YES")
 }
 
@@ -222,7 +222,7 @@ record(ai, "$(P)$(R)RotInterval_Start-S") {
 record(ai, "$(P)$(R)RotInterval_End-S") {
 	field(VAL, "4.119995729")
 	field(DESC, "Viscometry rotational speed.")
-	field(FLNK, "$(P)$(R)LastMeasInterval-RB")
+	field(FLNK, "$(P)$(R)LastMeasInterval-RB.PROC")
 	field(EGU, "rad/s")
 }
 record(ai, "$(P)$(R)RotInterval_Start-RB"){
@@ -232,7 +232,7 @@ record(ai, "$(P)$(R)RotInterval_Start-RB"){
 }
 
 record(ai, "$(P)$(R)RotInterval_End-RB") {
-	field(INP, "$(P)$(R)RotInterval_En_End-S NPP")
+	field(INP, "$(P)$(R)RotInterval_End-S NPP")
 	field(PINI, "YES")
 	field(EGU, "rad/s")
 }
@@ -241,14 +241,14 @@ record(ai, "$(P)$(R)FirstMeasTime-S") {
 	field(DESC, "First point measuring time.")
 	field(VAL, "0.25")
 	field(EGU, "s")
-	field(FLNK, "$(P)$(R)FirstMeasTime-RB")
+	field(FLNK, "$(P)$(R)FirstMeasTime-RB.PROC")
 }
 
 record(ai, "$(P)$(R)LastMeasTime-S") {
 	field(DESC, "Last point measuring time.")
 	field(VAL, "20")
 	field(EGU, "s")
-	field(FLNK, "$(P)$(R)LastMeasTime-RB")
+	field(FLNK, "$(P)$(R)LastMeasTime-RB.PROC")
 }
 
 record(ai, "$(P)$(R)FirstMeasTime-RB") {
@@ -301,16 +301,16 @@ record(longin, "$(P)$(R)MeasurementData_Visco-RB"){
 
 record(longin, "$(P)$(R)MeasurementData_AmpSweep-RB") {
 	field(DTYP, "stream")
-	field(INP, "@rheo_comm.proto getMeasurementValues_amp_sweep($(P)$(R)Numb_AmpSw-R,$(P)$(R)Temp_AmpSw-RB,$(P)$(R)PhaseAng-R,$(P)$(R)Torque_AmpSw-R,$(P)$(R)Strain1-RB,$(P)$(R)Strain2-RB) rheo")
+	field(INP, "@rheo_comm.proto getMeasurementValues_amp_sweep($(P)$(R)MeasNumb_AmpSw-R,$(P)$(R)Temp_AmpSw-R,$(P)$(R)PhaseAng-R,$(P)$(R)Torque_AmpSw-R,$(P)$(R)Strain1-R,$(P)$(R)Strain2-R) rheo")
 	field(SCAN, "I/O Intr")
 }
 
 record(ai, "$(P)$(R)PhaseAng-R") {
 	field(DESC, "Phase angle.")
 	field(EGU, "rad")
-	field(FLNK, "$(P)$(R)ArrayPhaseAng-RB")
+	field(FLNK, "$(P)$(R)ArrayPhaseAng-RB.PROC")
 	field(TSE, "-2")
-	field(TIME, "$(P)$(R)MeasNumb_AmpSw-R.TIME NPP")
+	field(TSEL, "$(P)$(R)MeasNumb_AmpSw-R.TIME NPP")
 }
 
 record(ai, "$(P)$(R)Strain1-R") {
@@ -380,7 +380,7 @@ record(ai, "$(P)$(R)Torque_AmpSw-R") {
 record(ai, "$(P)$(R)Temp_AmpSw-R") {
 	field(DESC, "Temperature in ctrl system.")
 	field(EGU, "K")
-	field(TSE. "-2")
+	field(TSE, "-2")
 	field(TSEL, "$(P)$(R)MeasNumb_AmpSw-R.TIME NPP")
 }
 
@@ -391,7 +391,7 @@ record(compress, "$(P)$(R)ArrayNumb_AmpSw-RB") {
 	field(BALG, "FIFO Buffer")
 }
 
-record(calc, "$(P)(R)ShearStress_AmpSw-RB") {
+record(calc, "$(P)$(R)ShearStress_AmpSw-RB") {
 	field(INPA, "$(P)$(R)Torque_AmpSw-R.VAL NPP")
 	field(INPB, "$(P)$(R)CSSfactor.VAL NPP")
 	field(CALC, "A*B")	
@@ -505,7 +505,7 @@ record(calc, "$(P)$(R)ShearStress_Visco-RB") {
 	field(TSEL, "$(P)$(R)MeasNumb_Visco-R.TIME NPP")
 }
 
-record(calc, "$(P)$(R)ShearRate-RB")
+record(calc, "$(P)$(R)ShearRate-RB") {
 	field(DESC, "Rotational speed / CSR factor")
 	field(INPA, "$(P)$(R)RotSpeed-R.VAL NPP")
 	field(INPB, "$(P)$(R)CSRfactor.VAL NPP")
@@ -518,7 +518,7 @@ record(calc, "$(P)$(R)ShearRate-RB")
 record(calc, "$(P)$(R)Viscosity-RB") {
 	field(DESC, "shear stress / shear rate")
 	field(INPA, "$(P)$(R)ShearStress_Visco-RB.VAL PP")
-	field(INPB, "$(P)$(R)ShearRate-RB.VAL" PP")
+	field(INPB, "$(P)$(R)ShearRate-RB.VAL PP")
 	field(CALC, "A/B")
 	field(EGU, "Pa*s")
 	field(TSE, "-2")
@@ -535,14 +535,14 @@ record(compress, "$(P)$(R)ArrayShearStress") {
 
 record(compress, "$(P)$(R)ArrayShearRate") {
 	field(ALG, "Circular Buffer")
-	field(INP, "$(P)$(R)ShearRate.VAL NPP")
+	field(INP, "$(P)$(R)ShearRate-RB.VAL NPP")
 	field(NSAM, "20")
 	field(BALG, "FIFO Buffer")
 }
 
 record(compress, "$(P)$(R)ArrayViscosity") {
 	field(ALG, "Circular Buffer")
-	field(INP, "$(P)$(R)Viscosity.VAL PP")
+	field(INP, "$(P)$(R)Viscosity-RB.VAL PP")
 	field(NSAM, "20")
 	field(BALG, "FIFO Buffer")
 	field(FLNK, "$(P)$(R)ArrayShearStress.PROC")
@@ -560,7 +560,7 @@ record(calc, "$(P)$(R)ShearStrain-RB") {
 record(calc, "$(P)$(R)TotModulus-RB") {
 	field(DESC, "Shear stress / strain")
 	field(INPA, "$(P)$(R)ShearStress_AmpSw-RB.VAL PP")
-	field(INPB, "$(P)$(R)ShearStrain.VAL PP")
+	field(INPB, "$(P)$(R)ShearStrain-RB.VAL PP")
 	field(CALC, "A/B")
 	field(EGU, "?")
 	field(TSE, "-2")
@@ -569,7 +569,7 @@ record(calc, "$(P)$(R)TotModulus-RB") {
 
 record(compress, "$(P)$(R)ArrayShearStrain") {
 	field(ALG, "Circular Buffer")
-	field(INP, "$(P)$(R)ShearStrain.VAL NPP")
+	field(INP, "$(P)$(R)ShearStrain-RB.VAL NPP")
 	field(NSAM, "20")
 	field(BALG, "FIFO Buffer")
 }