diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
index d276c99..ae65576 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
@@ -1,8 +1,8 @@
 #############################################
 ## Project       : ISTTOK slow Control
 ##
-## File          : 
-## Description   : Records for ISTTOK Control I/O channels connected to 2 Velleman board 
+## File          :
+## Description   : Records for ISTTOK Control I/O channels connected to 2 Velleman board
 ##
 ##
 ## Author        : Bernardo Carvalho (IPFN-IST)
@@ -23,108 +23,103 @@
 ### 24V commands - Optocoupler Out###
 #####################################
 record(bo, "$(P)$(R)TMPump1-ControllerOn" ) {
-#   	field(DESC,"Sinal p/ TMP 1, Liga a alimentação do controlador, vai a HIGH e depois a LOW")
-#       field( ZNAM, "Off" )record(bo, "$(P)$(R)TMPControllerOn" ) {
-	field(ZNAM, "Off" )
-	field(ONAM, "Pulse" )
-	field(HIGH, "2.5")
-    	field(FLNK, "$(P)$(R)TMPump1-ControllerOnInv" )
-	field(VAL,"0")
-
-#	field( FLNK, "$(P)$(R)TMPControllerOnInv" )
+    field(DESC,"Signal to TMP 1, goes HIGH and LW")
+    field(ZNAM, "Off" )
+    field(ONAM, "Pulse" )
+    field(HIGH, "2.5")
+    field(FLNK, "$(P)$(R)TMPump1-ControllerOnInv" )
+    field(VAL,"0")
 }
-record(calcout, "$(P)$(R)TMPump1-ControllerOnInv" ) {
-#record(calcout, "$(P)$(R)TMPControllerOnInv" ) {
-	field( INPA, "$(P)$(R)TMPControllerOn NPP MS" )
-	field( OUT,  "$(P)$(R)PCF8574:56:REGISTER.B0 PP MS" )
-	field( OOPT, "On Change" )
-	field( CALC, "A?0:1" )
+record(calcout, "$(P)$(R)TMPump1-ControllerOnInv") {
+    field(INPA, "$(P)$(R)TMPump1-ControllerOn NPP MS")
+    field(OUT,  "$(P)$(R)PCF8574:56:REGISTER.B0 PP MS")
+    field(OOPT, "On Change")
+    field(CALC, "A?0:1")
 }
 
 record(bo, "$(P)$(R)TMPump1-ControllerOff" ) {
 #   field(DESC," Sinal p/ TMP 1, desliga a alimentação do controlador, LOW->HIGH-> LOW")
 #   record(bo, "$(P)$(R)TMPControllerOff" ) {
-	field(ZNAM, "Off" )
-	field(ONAM, "Pulse" )
-	field(HIGH, "2.5")
-	#field( FLNK, "$(P)$(R)TMPControllerOffInv" )    
-	field(FLNK, "$(P)$(R)TMPump1-ControllerOffInv" )
-	field(VAL,"0")
+    field(ZNAM, "Off" )
+    field(ONAM, "Pulse" )
+    field(HIGH, "2.5")
+    field(FLNK, "$(P)$(R)TMPump1-ControllerOffInv" )
+    field(VAL,"0")
 }
 
 record(calcout, "$(P)$(R)TMPump1-ControllerOffInv") {
-	field( INPA, "$(P)$(R)TMPump1-ControllerOff NPP MS" )
-	field( OUT,  "$(P)$(R)PCF8574:56:REGISTER.B1 PP MS")
-	field( OOPT, "On Change" )
-	field( CALC, "A?0:1" )
+    field(INPA, "$(P)$(R)TMPump1-ControllerOff NPP MS" )
+    field(OUT,  "$(P)$(R)PCF8574:56:REGISTER.B1 PP MS")
+    field(OOPT, "On Change")
+    field(CALC, "A?0:1")
 }
 
 record(bo, "$(P)$(R)TMPump1-MotorOn" ) {
-	field( ZNAM, "Off")
-	field( ONAM, "Pulse")
-	field( HIGH, "2.5")
-	field( FLNK, "$(P)$(R)TMPump1-MotorOnInv")
+    field( ZNAM, "Off")
+    field( ONAM, "Pulse")
+    field( HIGH, "2.5")
+    field( FLNK, "$(P)$(R)TMPump1-MotorOnInv")
 }
 
 record(calcout, "$(P)$(R)TMPump1-MotorOnInv" ) {
-	field( INPA, "$(P)$(R)TMPump1-MotorOn NPP MS")
-	field( OUT,  "$(P)$(R)PCF8574:56:REGISTER.B2 PP MS")
-	field( OOPT, "On Change")
-	field( CALC, "A?0:1" )
+    field( INPA, "$(P)$(R)TMPump1-MotorOn NPP MS")
+    field( OUT,  "$(P)$(R)PCF8574:56:REGISTER.B2 PP MS")
+    field( OOPT, "On Change")
+    field( CALC, "A?0:1" )
 }
 
 record(bo, "$(P)$(R)TMPump1-MotorOff") {
-	field( ZNAM, "Off")
-	field( ONAM, "Pulse")
-	field( HIGH, "2.5")
-	field( FLNK, "$(P)$(R)TMPump1-MotorOffInv")
-	field(VAL,"0")
+    field( ZNAM, "Off")
+        field( ONAM, "Pulse")
+        field( HIGH, "2.5")
+        field( FLNK, "$(P)$(R)TMPump1-MotorOffInv")
+        field(VAL,"0")
 }
 
 record(calcout, "$(P)$(R)TMPump1-MotorOffInv") {
-	field( INPA, "$(P)$(R)TMPump1-MotorOff NPP MS")
-	field( OUT,  "$(P)$(R)PCF8574:56:REGISTER.B3 PP MS")
-	field( OOPT, "On Change")
-	field( CALC, "A?0:1")
+    field( INPA, "$(P)$(R)TMPump1-MotorOff NPP MS")
+        field( OUT,  "$(P)$(R)PCF8574:56:REGISTER.B3 PP MS")
+        field( OOPT, "On Change")
+        field( CALC, "A?0:1")
 }
 
 #############################
 ### TMP1 Controller inputs###
 #############################
 record(fanout, "$(P)$(R)PCF8574:56:REGISTER:READ:FNOUT"){
-	field(LNK1, "$(P)$(R)TMPump1-Power")
-	field(LNK2, "$(P)$(R)TMPump1-Emergency")
-	field(LNK3, "$(P)$(R)TMPump1-Acceleration")
-	field(LNK4, "$(P)$(R)TMPump1-NormalOperation")
+    field(LNK1, "$(P)$(R)TMPump1-Power")
+        field(LNK2, "$(P)$(R)TMPump1-Emergency")
+        field(LNK3, "$(P)$(R)TMPump1-Acceleration")
+        field(LNK4, "$(P)$(R)TMPump1-NormalOperation")
 }
 record(bi , "$(P)$(R)TMPump1-Power" ) {
-   field(DESC," TMP1 – Alimentada 220V ")
-	field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B4 NPP NMS")
-	field( ZNAM, "ON" )
-	field( ONAM, "OFF" )
+    field(DESC," TMP1 – Alimentada 220V ")
+        field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B4 NPP NMS")
+        field( ZNAM, "ON" )
+        field( ONAM, "OFF" )
 }
 record(bi , "$(P)$(R)TMPump1-Emergency") {
-   field(DESC," TMP1 – Falha ")
-	field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B6 NPP NMS")
+    field(DESC," TMP1 – Falha ")
+        field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B6 NPP NMS")
 #	field(VAL,"1")
-	field( ZNAM, "ON" )
-	field( ONAM, "OFF" )
-   	field(ZSV,"MAJOR")
+        field( ZNAM, "ON" )
+        field( ONAM, "OFF" )
+        field(ZSV,"MAJOR")
 }
 record(bi , "$(P)$(R)TMPump1-Acceleration") {
-   	field(DESC," TMP1 – Motor em aceleração ")
-	field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B5 NPP NMS")
-	field( ZNAM, "ON" )
-	field( ONAM, "OFF" )
-   	field(ZSV,"MINOR")
+    field(DESC," TMP1 – Motor em aceleração ")
+        field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B5 NPP NMS")
+        field( ZNAM, "ON" )
+        field( ONAM, "OFF" )
+        field(ZSV,"MINOR")
 }
 
 record(bi , "$(P)$(R)TMPump1-NormalOperation" ) {
-   	field(DESC," TMP1 – Operação Normal ")
-	field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B7 NPP NMS")
-	field( ZNAM, "ON" )
-	field(ONAM, "OFF" )
-   	field(OSV,"MINOR")
+    field(DESC," TMP1 – Operação Normal ")
+        field( INP, "$(P)$(R)PCF8574:56:REGISTER:READ.B7 NPP NMS")
+        field( ZNAM, "ON" )
+        field(ONAM, "OFF" )
+        field(OSV,"MINOR")
 }
 
 ###############
@@ -137,87 +132,87 @@ record(bi , "$(P)$(R)TMPump1-NormalOperation" ) {
 ### TMP2 Controller Inputs ###
 ##############################
 record(fanout, "$(P)$(R)PCF8574:57:REGISTER:READ:FNOUT"){
-	field(LNK1, "$(P)$(R)TMPump2-Emergency")
-	field(LNK2, "$(P)$(R)TMPump2-Acceleration")
-	field(LNK3, "$(P)$(R)TTSystem-tzero")
-	field(LNK4, "$(P)$(R)Emergency-PhysButton")
+    field(LNK1, "$(P)$(R)TMPump2-Emergency")
+        field(LNK2, "$(P)$(R)TMPump2-Acceleration")
+        field(LNK3, "$(P)$(R)TTSystem-tzero")
+        field(LNK4, "$(P)$(R)Emergency-PhysButton")
 }
 record(bi , "$(P)$(R)TMPump2-Emergency") {
-   	field(DESC," TMP2 – Falha ")
+    field(DESC," TMP2 – Falha ")
 #	field(INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B0 NPP NMS")
-	field(VAL,"1")
-	field(ZNAM, "ON" )
-	field(ONAM, "OFF" )
-   	field(ZSV,"MAJOR")
+        field(VAL,"1")
+        field(ZNAM, "ON" )
+        field(ONAM, "OFF" )
+        field(ZSV,"MAJOR")
 }
 
 record(bi , "$(P)$(R)TMPump2-Acceleration") {
-	field(DESC," TMP2 – START until Normal ")
-   	field( INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B1 NPP NMS")
-	field( ZNAM, "ON" )
-	field( ONAM, "OFF" )
+    field(DESC," TMP2 – START until Normal ")
+        field( INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B1 NPP NMS")
+        field( ZNAM, "ON" )
+        field( ONAM, "OFF" )
 }
 ####################################
 #       TIMING TRIGGER ON/OFF      #
 ####################################
 record(bi , "$(P)$(R)TTSystem-tzero" ) {
-	field(DESC,"Trigger control 60s before shot")
-	field(INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B7")
+    field(DESC,"Trigger control 60s before shot")
+        field(INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B7")
 #	field(VAL,"1")
-	field(ZNAM, "OFF" )
-	field(ONAM, "ON" )
+        field(ZNAM, "OFF" )
+        field(ONAM, "ON" )
 }
 
 ###############################
 ### TMP2 Controller Outputs ###
 ###############################
 record(bo, "$(P)$(R)TMPump2-Motor" ) {
-   field(DESC," Motor On/Off ")
+    field(DESC," Motor On/Off ")
 #   record(bo, "$(P)$(R)TMP2MotorOnOff" ) {
-	field( OUT,  "$(P)$(R)PCF8574:57:REGISTER.B2 PP MS")
-	field( ZNAM, "ON")
-	field( ONAM, "OFF")
+    field( OUT,  "$(P)$(R)PCF8574:57:REGISTER.B2 PP MS")
+        field( ZNAM, "ON")
+        field( ONAM, "OFF")
 }
 
 ##############################
 #       BUZZER ON/OFF        #
 ##############################
 record(bo, "$(P)$(R)Buzzer" ) {
-	field(DESC," Lab Buzzer ")
-	field(ZNAM, "Off" )
-	field(ONAM, "Pulse" )
-	field(HIGH, "2.5")
-	field(FLNK, "$(P)$(R)BuzzerInv" )
-	field(VAL, "0")
+    field(DESC," Lab Buzzer ")
+        field(ZNAM, "Off" )
+        field(ONAM, "Pulse" )
+        field(HIGH, "2.5")
+        field(FLNK, "$(P)$(R)BuzzerInv" )
+        field(VAL, "0")
 }
 record(calcout, "$(P)$(R)BuzzerInv" ) {
-	field(INPA, "$(P)$(R)Buzzer NPP MS" )
-	field(OUT,  "$(P)$(R)PCF8574:57:REGISTER.B3 PP MS" )
-	field(OOPT, "On Change" )
-	field(CALC, "A?0:1" )
+    field(INPA, "$(P)$(R)Buzzer NPP MS" )
+        field(OUT,  "$(P)$(R)PCF8574:57:REGISTER.B3 PP MS" )
+        field(OOPT, "On Change" )
+        field(CALC, "A?0:1" )
 }
 
 ##############################
 #       EMERGENCY MODE       #
 ##############################
 record(bi, "$(P)$(R)Emergency-PhysButton" ) {
-   	field(DESC,"External Physical Emergency Button")
-   	field(INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B4 NPP NMS")
-	field(ZNAM, "ON")
-	field(ONAM, "OFF" )
-	field(FLNK, "$(P)$(R)Emergency" )
+    field(DESC,"External Physical Emergency Button")
+        field(INP, "$(P)$(R)PCF8574:57:REGISTER:READ.B4 NPP NMS")
+        field(ZNAM, "ON")
+        field(ONAM, "OFF" )
+        field(FLNK, "$(P)$(R)Emergency" )
 }
 record(bo, "$(P)$(R)Emergency-UserButton" ) {
-   	field(DESC,"Soft User Emergency Button")
-	field(ZNAM, "OFF" )
-	field(ONAM, "ON")
-	field(FLNK, "$(P)$(R)Emergency" )
+    field(DESC,"Soft User Emergency Button")
+        field(ZNAM, "OFF" )
+        field(ONAM, "ON")
+        field(FLNK, "$(P)$(R)Emergency" )
 }
 record(calc, "$(P)$(R)Emergency" ) {
-   	field(DESC, "Emergency State")
-	field(INPA, "$(P)$(R)Emergency-PhysButton.RVAL NPP" ) 
-	field(INPB, "$(P)$(R)Emergency-UserButton.RVAL NPP" ) 
-	field(CALC, "A || B" ) # ! Not
+    field(DESC, "Emergency State")
+        field(INPA, "$(P)$(R)Emergency-PhysButton.RVAL NPP" )
+        field(INPB, "$(P)$(R)Emergency-UserButton.RVAL NPP" )
+        field(CALC, "A || B" ) # ! Not
 }
 
 ############
@@ -237,71 +232,71 @@ record(calc, "$(P)$(R)Emergency" ) {
 #       ROTARY1 PUMP        #
 #############################
 record( bo, "$(P)$(R)RPump1-Motor" ) {
-   field(DESC,"Power to Rotatory Pump 1. Relay 5")
-	field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B0 PP" )
-	field(ZNAM, "Off" )
-	field(ONAM, "On" )
-	field(VAL,"1")
-   	field(ZSV,"MINOR")
+    field(DESC,"Power to Rotatory Pump 1. Relay 5")
+        field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B0 PP" )
+        field(ZNAM, "Off" )
+        field(ONAM, "On" )
+        field(VAL,"1")
+        field(ZSV,"MINOR")
 }
 
 #############################
 #       ROTARY1 VALVE       #
 #############################
 record( bo, "$(P)$(R)RPump1-Valve" ) {
-	field(DESC,"Abre a valvula da bomba rot. Relay 4")
-	field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B1 PP" )
-	field(ZNAM, "Closed" )
-	field(ONAM, "Open" )
-	field(VAL,"1")
+    field(DESC,"Abre a valvula da bomba rot. Relay 4")
+        field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B1 PP" )
+        field(ZNAM, "Closed" )
+        field(ONAM, "Open" )
+        field(VAL,"1")
 }
 
 #############################
 #       ROTARY2 PUMP        #
 #############################
 record( bo, "$(P)$(R)RPump2-Motor" ) {
-	field(DESC,"Power On Rotatory Pump 2")
-	field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B2 PP" )
-	field(ZNAM, "Off" )
-	field(ONAM, "On" )
-	field(VAL,"1")
-   	field(ZSV,"MINOR")
+    field(DESC,"Power On Rotatory Pump 2")
+        field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B2 PP" )
+        field(ZNAM, "Off" )
+        field(ONAM, "On" )
+        field(VAL,"1")
+        field(ZSV,"MINOR")
 }
 
 #############################
 #       ROTARY2 VALVE       #
 #############################
 record( bo, "$(P)$(R)RPump2-Valve" ) {
-   	field(DESC," Abre a valvula da bomba rotatoria 2 ")
-	field(OUT,"$(P)$(R)PCF8574:60:REGISTER.B3 PP" )
-	field(ZNAM,"Closed" )
-	field(ONAM,"Open" )
-	field(VAL,"1")
+    field(DESC," Abre a valvula da bomba rotatoria 2 ")
+        field(OUT,"$(P)$(R)PCF8574:60:REGISTER.B3 PP" )
+        field(ZNAM,"Closed" )
+        field(ONAM,"Open" )
+        field(VAL,"1")
 }
 
 ################################
 #       FILAMENT ON/OFF        #
 ################################
 record(bo, "$(P)$(R)VVessel-Filament" ) {
-   field(DESC,"Vacuum Vessel Filament power")
+    field(DESC,"Vacuum Vessel Filament power")
 #   record(bo, "$(P)$(R)FilamentOnOff" ) {
-	field( OUT, "$(P)$(R)PCF8574:60:REGISTER.B4 PP" )
-	field( ZNAM, "On" )
-	field( ONAM, "Off" )
-	field(VAL,"1")
-	field(PINI,"YES")
+    field( OUT, "$(P)$(R)PCF8574:60:REGISTER.B4 PP" )
+        field( ZNAM, "On" )
+        field( ONAM, "Off" )
+        field(VAL,"1")
+        field(PINI,"YES")
 }
 
 ##############################
 #       LIGHTS ON/OFF        #
 ##############################
 record(bo, "$(P)$(R)Lab-WarningLight" ) {
-   field(DESC," Luzes de sinalização, 220V ")
+    field(DESC," Luzes de sinalização, 220V ")
 #   record(bo, "$(P)$(R)LightsOnOff" ) {
-	field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B5 PP" )
-	field(ZNAM, "On" )
-	field(ONAM, "Off" )
-	field(VAL,"1")
+    field(OUT, "$(P)$(R)PCF8574:60:REGISTER.B5 PP" )
+        field(ZNAM, "On" )
+        field(ONAM, "Off" )
+        field(VAL,"1")
 }
 
 ############
@@ -314,10 +309,10 @@ record(bo, "$(P)$(R)Lab-WarningLight" ) {
 ##############################
 record(bo, "$(P)$(R)Clean-TorContactor" ) {
 #   field(DESC," Contactor 220V do transformador para a fonte de campo toroidal das descargas de limpeza (500 A) ")
-	field( OUT, "$(P)$(R)PCF8574:60:REGISTER.B7 PP" )
-	field( ZNAM, "On" )
-	field( ONAM, "Off" )
-	field(VAL,"1")
+    field( OUT, "$(P)$(R)PCF8574:60:REGISTER.B7 PP" )
+        field( ZNAM, "On" )
+        field( ONAM, "Off" )
+        field(VAL,"1")
 }
 
 ###############
@@ -331,34 +326,34 @@ record(bo, "$(P)$(R)Clean-TorContactor" ) {
 ############################
 record(bo, "$(P)$(R)Clean-TorPneuBreaker" ) {
 ##   field(DESC," Interruptor de ar comprimido  do transformador para a fonte de campo toroidal das descargas de limpeza (500 A)")
-	field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B0 PP" )
-	field( ZNAM, "On" )
-	field( ONAM, "Off" )
-	field(VAL,"1")
+    field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B0 PP" )
+        field( ZNAM, "On" )
+        field( ONAM, "Off" )
+        field(VAL,"1")
 }
 
 record(bo, "$(P)$(R)Shot-TorPSDisable" ) {
 #   field(DESC," É desligado na emergência e em qualquer estado que não seja Process ou Wait Shot.")
-	field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B1 PP" )
-	field( ZNAM, "Off" )
-	field( ONAM, "On" )
-	field(VAL,"1")
+    field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B1 PP" )
+        field( ZNAM, "Off" )
+        field( ONAM, "On" )
+        field(VAL,"1")
 }
 
 record(bo, "$(P)$(R)Shot-TorPSTrigger" ) {
-	field(DESC," Trigger da FRAEP")
-	field( ZNAM, "Off" )
-	field( ONAM, "Pulse" )
-	field( HIGH, "2.5")
-    	field( FLNK, "$(P)$(R)Shot-TorPSTriggerInv" )
-	field(VAL,"0")
+    field(DESC," Trigger da FRAEP")
+        field( ZNAM, "Off" )
+        field( ONAM, "Pulse" )
+        field( HIGH, "2.5")
+        field( FLNK, "$(P)$(R)Shot-TorPSTriggerInv" )
+        field(VAL,"0")
 }
 record(calcout, "$(P)$(R)Shot-TorPSTriggerInv" ) {
 #   field(DESC," $(R)")
-	field( INPA, "$(P)$(R)ToroidalShotTriggerOnOff NPP MS" )
-	field( OUT,  "$(P)$(R)PCF8574:61:REGISTER.B2 PP MS" )
-	field( OOPT, "On Change" )
-	field( CALC, "A?0:1" )
+    field( INPA, "$(P)$(R)ToroidalShotTriggerOnOff NPP MS" )
+        field( OUT,  "$(P)$(R)PCF8574:61:REGISTER.B2 PP MS" )
+        field( OOPT, "On Change" )
+        field( CALC, "A?0:1" )
 }
 ############################################################
 
@@ -368,10 +363,10 @@ record(calcout, "$(P)$(R)Shot-TorPSTriggerInv" ) {
 record(bo, "$(P)$(R)CapBank-Charge" ) {
 ##   field(DESC," Contactor 220V do circuito de carga do banco de condensadores p/ SHOT (ELCO) ")
 #record(bo, "$(P)$(R)CapBankChargeOnOff" ) {
-	field(OUT, "$(P)$(R)PCF8574:61:REGISTER.B3 PP" )
-	field(ZNAM, "On" )
-	field(ONAM, "Off" )
-	field(VAL,"1")
+    field(OUT, "$(P)$(R)PCF8574:61:REGISTER.B3 PP" )
+        field(ZNAM, "On" )
+        field(ONAM, "Off" )
+        field(VAL,"1")
 }
 
 ########################################
@@ -380,10 +375,10 @@ record(bo, "$(P)$(R)CapBank-Charge" ) {
 record(bo, "$(P)$(R)Clean-PrimContactor" ) {
 #   field(DESC," Contactor 220V do para o primário das descargas de limpeza ")
 #   record(bo, "$(P)$(R)PrimaryCleanContactorOnOff" ) {
-	field(OUT,  "$(P)$(R)PCF8574:61:REGISTER.B4 PP MS" )
-	field(ZNAM, "On" )
-	field(ONAM, "Off" )
-	field(VAL,"1")
+    field(OUT,  "$(P)$(R)PCF8574:61:REGISTER.B4 PP MS" )
+        field(ZNAM, "On" )
+        field(ONAM, "Off" )
+        field(VAL,"1")
 }
 
 ####################################
@@ -391,11 +386,11 @@ record(bo, "$(P)$(R)Clean-PrimContactor" ) {
 ####################################
 record(bo, "$(P)$(R)Clean-PrimPneuBreaker"){
 #record(bo, "$(P)$(R)PrimaryCleanBreakerOnOff"){
-	field( DESC, "Primary Cleaning OnOff")
-	field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B5 PP" )
-	field( ZNAM, "On")
-	field( ONAM, "Off")
-	field(VAL,"1")
+    field( DESC, "Primary Cleaning OnOff")
+        field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B5 PP" )
+        field( ZNAM, "On")
+        field( ONAM, "Off")
+        field(VAL,"1")
 }
 
 ##################################
@@ -404,22 +399,22 @@ record(bo, "$(P)$(R)Clean-PrimPneuBreaker"){
 record(bo, "$(P)$(R)GasIS-Valves" ) {
 #   field(DESC," 2 válvulas pneumáticas de corte do sistema de injecção de H/D/Ne/He no TOK, 24V out = deixa passar")
 #   record(bo, "$(P)$(R)GISValvesOnOff" ) {
-	field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B6 PP" )
-	field( ZNAM, "On" )
-	field( ONAM, "Off" )
-	field(VAL,"1")
+    field( OUT, "$(P)$(R)PCF8574:61:REGISTER.B6 PP" )
+        field( ZNAM, "On" )
+        field( ONAM, "Off" )
+        field(VAL,"1")
 }
 
 ##########################################
 #       CAP BANK DISCHARGE ON/OFF        #
 ##########################################
 record(bo, "$(P)$(R)CapBank-Discharge" ) {
-   	field(DESC," Liga o circuito de descarga do ELCO ")
+    field(DESC," Liga o circuito de descarga do ELCO ")
 #   record(bo, "$(P)$(R)CapBankDischargeOnOff" ) {
-	field(OUT, "$(P)$(R)PCF8574:61:REGISTER.B7 PP" )
-	field(ZNAM, "On" )
-	field(ONAM, "Off" )
-	field(VAL,"1")
+    field(OUT, "$(P)$(R)PCF8574:61:REGISTER.B7 PP" )
+        field(ZNAM, "On" )
+        field(ONAM, "Off" )
+        field(VAL,"1")
 }
 
 #record(bo,"$(P)$(R)Primary-PressureCondition"){
@@ -431,9 +426,9 @@ record(bo, "$(P)$(R)CapBank-Discharge" ) {
 record(ai,"$(P)$(R)TMPump2-Speed"){
 #   field(DESC," ADC Pump speed 0-10V ")
 #record(ai,"$(P)$(R)Turbo2_Speed"){
-	field(PREC,"3")
-	field(EGU,"RPM")
-	field(VAL,"0")
+    field(PREC,"3")
+        field(EGU,"RPM")
+        field(VAL,"0")
 }
 
 #######################
@@ -442,8 +437,8 @@ record(ai,"$(P)$(R)TMPump2-Speed"){
 record(bo, "$(P)$(R)TMPump1-ManualValve"){
 #   field(DESC," $(R)")
 #record(bo, "$(P)$(R)TMPManualValve"){
-	info(autosaveFields, "VAL")
-	field( DESC, "State of manual valve")
-	field( ZNAM, "Closed")
-	field( ONAM, "Open")
+    info(autosaveFields, "VAL")
+        field( DESC, "State of manual valve")
+        field( ZNAM, "Closed")
+        field( ONAM, "Open")
 }
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8574.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8574.db
index 08c0df5..aa02137 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8574.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8574.db
@@ -18,20 +18,20 @@
 # ### Read/Write pcf8574 address 0x38=56 register ### #
 ###################################################
 record( mbboDirect, "$(P)$(R)PCF8574:56:REGISTER") {
-	field(DTYP, "stream")
-	field(OUT,  "@pcf8574.proto wReg(56) I2C")
-	field(SHFT, "0")
-	field(NOBT, "8")
-	field(VAL, 255)
+    field(DTYP, "stream")
+    field(OUT,  "@pcf8574.proto wReg(56) $(BUS)")
+    field(SHFT, "0")
+    field(NOBT, "8")
+    field(VAL, 255)
 #	field(PINI,"YES")
 }
 
 record( mbbiDirect, "$(P)$(R)PCF8574:56:REGISTER:READ" ) {
-	field(DTYP, "stream")
-	field(INP,  "@pcf8574.proto rReg(56) I2C")
-	field(NOBT, "8")
-	field(SCAN, "1 second")
-	field(FLNK, "$(P)$(R)PCF8574:56:REGISTER:READ:FNOUT")
+    field(DTYP, "stream")
+    field(INP,  "@pcf8574.proto rReg(56) $(BUS)")
+    field(NOBT, "8")
+    field(SCAN, "1 second")
+    field(FLNK, "$(P)$(R)PCF8574:56:REGISTER:READ:FNOUT")
 }
 
 #####################################################
@@ -39,7 +39,7 @@ record( mbbiDirect, "$(P)$(R)PCF8574:56:REGISTER:READ" ) {
 ###################################################
 record( mbboDirect, "$(P)$(R)PCF8574:57:REGISTER") {
 	field(DTYP, "stream")
-	field(OUT,  "@pcf8574.proto wReg(57) I2C")
+	field(OUT,  "@pcf8574.proto wReg(57) $(BUS)")
 	field(SHFT, "0")
 	field(NOBT, "8")
 	field(VAL, 255)
@@ -48,7 +48,7 @@ record( mbboDirect, "$(P)$(R)PCF8574:57:REGISTER") {
 
 record( mbbiDirect, "$(P)$(R)PCF8574:57:REGISTER:READ" ) {
 	field(DTYP, "stream")
-	field(INP,  "@pcf8574.proto rReg(57) I2C")
+	field(INP,  "@pcf8574.proto rReg(57) $(BUS)")
 	field(NOBT, "8")
 	field(SCAN, "1 second")
 	field(FLNK, "$(P)$(R)PCF8574:57:REGISTER:READ:FNOUT")
@@ -59,7 +59,7 @@ record( mbbiDirect, "$(P)$(R)PCF8574:57:REGISTER:READ" ) {
 ###################################################
 record( mbboDirect, "$(P)$(R)PCF8574:60:REGISTER") {
 	field( DTYP, "stream")
-	field( OUT,  "@pcf8574.proto wReg(60) I2C")
+	field( OUT,  "@pcf8574.proto wReg(60) $(BUS)")
 	field( SHFT, "0")
 	field( NOBT, "8")
 	field(VAL, 255)
@@ -68,7 +68,7 @@ record( mbboDirect, "$(P)$(R)PCF8574:60:REGISTER") {
 
 record( mbbiDirect, "$(P)$(R)PCF8574:60:REGISTER:READ" ) {
 	field( DTYP, "stream")
-	field( INP,  "@pcf8574.proto rReg(60) I2C")
+	field( INP,  "@pcf8574.proto rReg(60) $(BUS)")
 	field(NOBT, "8")
 	field(SCAN, "1 second")
 #	field(FLNK, "$(P)$(R)PCF8574:60:REGISTER:READ:FNOUT")
@@ -80,7 +80,7 @@ record( mbbiDirect, "$(P)$(R)PCF8574:60:REGISTER:READ" ) {
 ###################################################
 record( mbboDirect, "$(P)$(R)PCF8574:61:REGISTER") {
 	field( DTYP, "stream")
-	field( OUT,  "@pcf8574.proto wReg(61) I2C")
+	field( OUT,  "@pcf8574.proto wReg(61) $(BUS)")
 	field( SHFT, "0")
 	field( NOBT, "8")
 	field(VAL, 255)
@@ -89,7 +89,7 @@ record( mbboDirect, "$(P)$(R)PCF8574:61:REGISTER") {
 
 record( mbbiDirect, "$(P)$(R)PCF8574:61:REGISTER:READ" ) {
 	field( DTYP, "stream")
-	field( INP,  "@pcf8574.proto rReg(61) I2C")
+	field( INP,  "@pcf8574.proto rReg(61) $(BUS)")
 	field(NOBT, "8")
 	field(SCAN, "1 second")
 	#field(PINI,"YES")
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
index 0aad50b..3ddbfc2 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
@@ -17,18 +17,18 @@
 #####################################################
 # Read/Write pcf8591 register @ address 0x48=d72 ### #
 #####################################################
-record( mbboDirect, "$(P)$(R)PCF8591:72:CTRLREGISTER") {
-	field(DTYP, "stream")
-	field(OUT,  "@pcf8591.proto wReg(72) I2C")
-	field(SHFT, "0")
-	field(NOBT, "8")
-	field(VAL, 255)
-	field(PINI,"YES")
+record(mbboDirect, "$(P)$(R)PCF8591:72:CTRLREGISTER") {
+    field(DTYP, "stream")
+    field(OUT,  "@pcf8591.proto wReg(72) $(BUS)")
+    field(SHFT, "0")
+    field(NOBT, "8")
+    field(VAL, 255)
+    field(PINI,"YES")
 }
 # Receiving two bytes. last one counts
 record( longin, "$(P)$(R)PCF8591:72:ADC_CH1" ) {
-	field(DTYP, "stream")
-	field(INP,  "@pcf8591.proto rConvAdc0(72) I2C")
+    field(DTYP, "stream")
+    field(INP,  "@pcf8591.proto rConvAdc0(72) $(BUS)")
 }
 record( calc, "$(P)$(R)PCF8591:72:BYTE2_CH1" ) {
   field(INPA, "$(P)$(R)PCF8591:72:ADC_CH1 PP NMS")
@@ -37,29 +37,29 @@ record( calc, "$(P)$(R)PCF8591:72:BYTE2_CH1" ) {
 }
 
 record( ai, "$(P)$(R)TMPump2-Speed" ) {
-  field(DESC, "TMPump2-Speed")
-  field(DTYP, "Raw Soft Channel" )
-  field(INP, "$(P)$(R)PCF8591:72:BYTE2_CH1 PP NMS")
+    field(DESC, "TMPump2-Speed")
+    field(DTYP, "Raw Soft Channel" )
+    field(INP, "$(P)$(R)PCF8591:72:BYTE2_CH1 PP NMS")
 #  field(SCAN, "1 second")
-  field(ASLO, "16" )
-  field(AOFF, "0" )
-  field(EGU,  "RPM" )
-  field(PREC, "3" )
-  field(HOPR, "5000" )
-  field(LOPR, "0" )
-  field(LOW, "200.0")
-#   #   field(LOLO,"0.0")
-  field(LSV, "MINOR")
-#   #   field(LLSV,"MAJOR")
+    field(ASLO, "16" )
+    field(AOFF, "0" )
+    field(EGU,  "RPM" )
+    field(PREC, "3" )
+    field(HOPR, "5000" )
+    field(LOPR, "0" )
+    field(LOW, "200.0")
+#      field(LOLO,"0.0")
+    field(LSV, "MINOR")
+#      field(LLSV,"MAJOR")
 }
 record( longin, "$(P)$(R)PCF8591:72:ADC_CH2" ) {
-	field(DTYP, "stream")
-	field(INP,  "@pcf8591.proto rConvAdc1(72) I2C")
+    field(DTYP, "stream")
+	field(INP,  "@pcf8591.proto rConvAdc1(72) $(BUS)")
 }
 record( calc, "$(P)$(R)PCF8591:72:BYTE2_CH2" ) {
-  field(INPA, "$(P)$(R)PCF8591:72:ADC_CH2 PP NMS")
+    field(INPA, "$(P)$(R)PCF8591:72:ADC_CH2 PP NMS")
 # LSB i=last byte received
-  field(CALC, " (A & 255)" )
+  field(CALC, "(A & 255)" )
 }
 
 record( ai, "$(P)$(R)TMPump2-Current" ) {
@@ -82,7 +82,7 @@ record( ai, "$(P)$(R)TMPump2-Current" ) {
 # Receiving two bytes. last one counts
 record( longin, "$(P)$(R)PCF8591:72:ADC_CH3" ) {
 	field(DTYP, "stream")
-	field(INP,  "@pcf8591.proto rConvAdc2(72) I2C")
+	field(INP,  "@pcf8591.proto rConvAdc2(72) $(BUS)")
 }
 record( calc, "$(P)$(R)PCF8591:72:BYTE2_CH3" ) {
   field(INPA, "$(P)$(R)PCF8591:72:ADC_CH3 PP NMS")
@@ -110,7 +110,7 @@ record(ai, "$(P)$(R)Shot-TorPSCurrentImage" ) {
 
 record( longout, "$(P)$(R)PCF8591:72:DAC") {
 	field(DTYP, "stream")
-	field(OUT,  "@pcf8591.proto wDac(72) I2C")
+	field(OUT,  "@pcf8591.proto wDac(72) $(BUS)")
 	field(DRVH, "255" )
         field(DRVL, "0" )
 	field(VAL, 128)
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto
index 305b265..738bc78 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8574.proto
@@ -1,5 +1,5 @@
 Terminator   = "";
-LockTimeout  = 200;
+LockTimeout  = 500;
 ReplyTimeout = 100;
 ReadTimeout  = 100;
 WriteTimeout = 100;
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto
index 7e10313..c7765e9 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pcf8591.proto
@@ -1,11 +1,11 @@
 Terminator   = "";
-LockTimeout  = 500;
+LockTimeout  = 200;
 ReplyTimeout = 100;
 ReadTimeout  = 100;
 WriteTimeout = 100;
 MaxInput     = 2;
 ExtraInput   = Error;
- 
+
 rReg {
   out ${1};
   in  "%01r";
@@ -17,7 +17,7 @@ rReg {
 # Bits 4,5 ADC configuration . 00 = four single ended channels
 # Bits 6 : DAC Output enable bit
 # Bits 7 : =0
- 
+
 rConvAdc0 {
   out ${1} 64;
   in  "%02r";
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
index b5bbbba..2ce6435 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
@@ -1,4 +1,5 @@
-# autosave R5.3	Automatically generated - DO NOT MODIFY - 210511-172433
+# autosave R5.3	Automatically generated - DO NOT MODIFY - 210512-110358
+! 1 channel(s) not connected - or not all gets were successful
 ISTTOK:central:PULSE-NUMBER.VAL 0
 ISTTOK:central:LogMessage.VAL 
 ISTTOK:central:LASTOPSTATE.VAL 5
@@ -7,5 +8,5 @@ ISTTOK:central:PROCESS-MODE.VAL 0
 ISTTOK:central:CLEANINGMANMODE.VAL 0
 ISTTOK:central:Emergency-UserButton.VAL 0
 ISTTOK:central:TMPump1-ManualValve.VAL 0
-ISTTOK:central:Shot-TorPSCurrent 1
+#ISTTOK:central:Shot-TorPSCurrent Search Issued
 <END>
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
index 6952723..4181440 100755
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
@@ -21,7 +21,7 @@ drvAsynI2CConfigure( "I2C", "/dev/i2c-1", 1 )
 dbLoadRecords("db/ISTTOKstates.db","P=ISTTOK:,R=central:")
 dbLoadRecords("db/ISTTOKpcf8574.db","P=ISTTOK:,R=central:,BUS=I2C")
 dbLoadRecords("db/ISTTOKpcf8591.db","P=ISTTOK:,R=central:,BUS=I2C")
-dbLoadRecords("db/ISTTOKtda8444.db","P=ISTTOK:,R=central:,BUS=I2C")
+#dbLoadRecords("db/ISTTOKtda8444.db","P=ISTTOK:,R=central:,BUS=I2C")
 dbLoadRecords("db/ISTTOKmachineControl.db","P=ISTTOK:,R=central:")
 
 ## Load Serial drivers
@@ -44,7 +44,7 @@ drvAsynIPPortConfigure("L0","193.136.136.3:25",0,1,0)
 
 dbLoadRecords("db/sendmail.db", "P=ISTTOK:,PORT=L0,R=central:,L=0,A=0")
 
-# Uncomment to Debug STREAM serial activity
+# Uncomment to Debug STREAMDEVICE serial activity
 #var streamError 1
 #var streamDebug 1
 streamSetLogfile("logfile.txt")