diff --git a/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java b/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java
index 6afefe83..eb8caeed 100644
--- a/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java
+++ b/app/src/main/java/com/mqbcoding/stats/DashboardFragment.java
@@ -1,10 +1,8 @@
 package com.mqbcoding.stats;
 
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.res.TypedArray;
@@ -15,9 +13,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -28,8 +23,6 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.prowl.torque.remote.ITorqueService;
-
 import com.github.anastr.speedviewlib.Gauge;
 import com.github.anastr.speedviewlib.RaySpeedometer;
 import com.github.anastr.speedviewlib.Speedometer;
@@ -37,7 +30,8 @@
 import com.github.anastr.speedviewlib.components.Indicators.Indicator;
 import com.github.martoreto.aauto.vex.CarStatsClient;
 
-import java.lang.reflect.Field;
+import org.prowl.torque.remote.ITorqueService;
+
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.HashMap;
@@ -83,7 +77,6 @@ public class DashboardFragment extends CarFragment {
     private boolean torqueBind = false;
 
 
-
     private View.OnClickListener forceUpdate = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -124,6 +117,7 @@ public void onNewMeasurements(String provider, Date timestamp, Map<String, Objec
             mLastMeasurements.putAll(values);
             Log.i(TAG, "onCarStatsClient.Listener");
         }
+
         @Override
         public void onSchemaChanged() {
             // do nothing
@@ -210,14 +204,13 @@ private void updateDisplay() {
 
             @Override
             public void run() {
-            postUpdate();
+                postUpdate();
             }
 
-        },0,1000);//Update text every second
+        }, 0, 1000);//Update text every second
     }
 
 
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -329,7 +322,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mClockCenter.setSpeedTextTypeface(typeface);
         mClockRight.setSpeedTextTypeface(typeface);
 
-        if (selectedTheme.equals("Beetle")){
+        if (selectedTheme.equals("Beetle")) {
             Typeface beetletypeface = Typeface.createFromAsset(getContext().getAssets(), "Schluber.ttf");
             mClockLeft.setTextTypeface(beetletypeface);
             mClockCenter.setTextTypeface(beetletypeface);
@@ -483,7 +476,7 @@ public void onGlobalLayout() {
                     final Handler staging = new Handler();
                     staging.postDelayed(new Runnable() {
                         public void run() {
-                            if (mClockLeft != null){
+                            if (mClockLeft != null) {
                                 mClockLeft.speedTo(0, 1000);
                                 mClockCenter.speedTo(0, 1000);
                                 mClockRight.speedTo(0, 1000);
@@ -497,13 +490,13 @@ public void run() {
                     final Handler stagingReset = new Handler();
                     stagingReset.postDelayed(new Runnable() {
                         public void run() {
-                            if (mClockLeft != null){
-                                mClockMaxLeft.speedTo(mClockLeft.getSpeed(),1000);
-                                mClockMinLeft.speedTo(mClockLeft.getSpeed(),1000);
-                                mClockMinCenter.speedTo(mClockCenter.getSpeed(),1000);
-                                mClockMaxCenter.speedTo(mClockCenter.getSpeed(),1000);
-                                mClockMaxRight.speedTo(mClockRight.getSpeed(),1000);
-                                mClockMinRight.speedTo(mClockRight.getSpeed(),1000);
+                            if (mClockLeft != null) {
+                                mClockMaxLeft.speedTo(mClockLeft.getSpeed(), 1000);
+                                mClockMinLeft.speedTo(mClockLeft.getSpeed(), 1000);
+                                mClockMinCenter.speedTo(mClockCenter.getSpeed(), 1000);
+                                mClockMaxCenter.speedTo(mClockCenter.getSpeed(), 1000);
+                                mClockMaxRight.speedTo(mClockRight.getSpeed(), 1000);
+                                mClockMinRight.speedTo(mClockRight.getSpeed(), 1000);
 
                                 mTextMaxLeft.setText("-");
                                 mTextMinLeft.setText("-");
@@ -513,9 +506,9 @@ public void run() {
                                 mTextMaxRight.setText("-");
                             }
                         }
-                    }, 2500);
+                    }, 2000);
 
-                  stagingDone = true;
+                    stagingDone = true;
 
                 }
             }
@@ -622,11 +615,11 @@ public void onResume() {
             intent.setClassName("org.prowl.torque", "org.prowl.torque.remote.TorqueService");
             boolean successfulBind = getContext().bindService(intent, torqueConnection, 0);
 
-            if ( ! successfulBind ) {
+            if (!successfulBind) {
                 throw new Exception("Couldn't connect to Torque");
             }
-        } catch ( Exception e ) {
-            Log.e(TAG,"Error: " + e.getMessage());
+        } catch (Exception e) {
+            Log.e(TAG, "Error: " + e.getMessage());
         }
     }
 
@@ -683,13 +676,12 @@ public void onDestroyView() {
         mDebugQuery = null;
         selectedFont = null;
         pressureUnit = null;
+        stagingDone = false;
 
         if (torqueBind)
             try {
                 getContext().unbindService(torqueConnection);
-            }
-            catch (Exception E)
-            {
+            } catch (Exception E) {
                 throw E;
             }
 
@@ -795,68 +787,68 @@ private void setupElement(String queryElement, TextView value, TextView label) {
 
         // set items to have a "-" as value.
         switch (queryElement) {
-            // case "test":
-            // case "debug":
-            // case "torque_version":
-            // case "batteryVoltage":
-            // case "torque_voltage_0xff1238":
-            // case "Nav_Altitude":
-            // case "Nav_Heading":
-            // case "coolantTemperature":
-            // case "oilTemperature":
-            // case "vehicleSpeed":
-            // case "torque_speed_0x0d":
-            // case "torque_rpm_0x0c":
-            // case "engineSpeed":
-            // case "currentOutputPower":
-            // case "currentTorque":
-            // case "gearboxOilTemperature":
-            // case "outsideTemperature":
-            // case "currentGear":
-            // case "torque_accelerometer_total_0xff1223":
-            // case "lateralAcceleration":
-            // case "longitudinalAcceleration":
-            // case "yawRate":
-            // case "wheelAngle":
-            // case "acceleratorPosition":
-            // case "brakePressure":
-            // case "powermeter":
-            // case "EcoHMI_Score.AvgShort":
-            // case "EcoHMI_Score.AvgTrip":
-            // case "shortTermConsumptionPrimary":
-            // case "shortTermConsumptionSecondary":
-            // case "Nav_CurrentPosition.Longitude":
-            // case "Nav_CurrentPosition.Latitude":
-            // case "Nav_CurrentPosition.City":
-            // case "Nav_CurrentPosition.State":
-            // case "Nav_CurrentPosition.Country":
-            // case "Nav_CurrentPosition.Street":
-            // case "blinkingState":
-            // case "Sound_Volume":
-            // case "Radio_Tuner.Name":
-            // case "Radio_Text":
-            // case "totalDistance.distanceValue":
-            // case "vehicleIdenticationNumber.VIN":
-            // case "tyreStates.stateRearRight":
-            // case "tyreStates.stateRearLeft":
-            // case "tyreStates.stateFrontRight":
-            // case "tyreStates.stateFrontLeft":
-            // case "torque_fuelpressure_0x0a":
-            // case "torque_engineload_0x04":
-            // case "torque_timing_advance_0x0e":
-            // case "torque_intake_air_temperature_0x0f":
-            // case "torque_mass_air_flow_0x10":
-            // case "torque_throttle_position_0x11":
-            // case "torque_turboboost_0xff1202":
-            // case "torque_AFR_0xff1249":
-            // case "torque_fueltrimshortterm1_0x06":
-            // case "torque_fueltrimlongterm1_0x07":
-            // case "torque_fueltrimshortterm2_0x08":
-            // case "torque_fueltrimlongterm2_0x09":
-            //     label.setText("");
-            //     value.setText("-");
-            //     label.setBackgroundResource(0);
-            //     break;
+            case "test":
+            case "debug":
+            case "torque_version":
+            case "batteryVoltage":
+            case "torque_voltage_0xff1238":
+            case "Nav_Altitude":
+            case "Nav_Heading":
+            case "coolantTemperature":
+            case "oilTemperature":
+            case "vehicleSpeed":
+            case "torque_speed_0x0d":
+            case "torque_rpm_0x0c":
+            case "engineSpeed":
+            case "currentOutputPower":
+            case "currentTorque":
+            case "gearboxOilTemperature":
+            case "outsideTemperature":
+            case "currentGear":
+            case "torque_accelerometer_total_0xff1223":
+            case "lateralAcceleration":
+            case "longitudinalAcceleration":
+            case "yawRate":
+            case "wheelAngle":
+            case "acceleratorPosition":
+            case "brakePressure":
+            case "powermeter":
+            case "EcoHMI_Score.AvgShort":
+            case "EcoHMI_Score.AvgTrip":
+            case "shortTermConsumptionPrimary":
+            case "shortTermConsumptionSecondary":
+            case "Nav_CurrentPosition.Longitude":
+            case "Nav_CurrentPosition.Latitude":
+            case "Nav_CurrentPosition.City":
+            case "Nav_CurrentPosition.State":
+            case "Nav_CurrentPosition.Country":
+            case "Nav_CurrentPosition.Street":
+            case "blinkingState":
+            case "Sound_Volume":
+            case "Radio_Tuner.Name":
+            case "Radio_Text":
+            case "totalDistance.distanceValue":
+            case "vehicleIdenticationNumber.VIN":
+            case "tyreStates.stateRearRight":
+            case "tyreStates.stateRearLeft":
+            case "tyreStates.stateFrontRight":
+            case "tyreStates.stateFrontLeft":
+            case "torque_fuelpressure_0x0a":
+            case "torque_engineload_0x04":
+            case "torque_timing_advance_0x0e":
+            case "torque_intake_air_temperature_0x0f":
+            case "torque_mass_air_flow_0x10":
+            case "torque_throttle_position_0x11":
+            case "torque_turboboost_0xff1202":
+            case "torque_AFR_0xff1249":
+            case "torque_fueltrimshortterm1_0x06":
+            case "torque_fueltrimlongterm1_0x07":
+            case "torque_fueltrimshortterm2_0x08":
+            case "torque_fueltrimlongterm2_0x09":
+                label.setText("");
+                value.setText("-");
+                label.setBackgroundResource(0);
+                break;
             case "none":
                 label.setText("");
                 value.setText("");
@@ -1060,22 +1052,21 @@ private void setupClocks(String queryClock, Speedometer clock, TextView icon, Ra
         ImageIndicator imageIndicator = new ImageIndicator(getContext(), needleResource, clockSize, clockSize);
 
 
-
         switch (queryClock) {
             case "none": // currently impossible to choose, maybe in the future?
-                setupClock(icon,"ic_none","",clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", "", clock, false, "", 0, 100, "float");
                 break;
             case "test":
-                setupClock(icon,"ic_measurement","",clock,false,getString(R.string.testing),0,360,"float");
+                setupClock(icon, "ic_measurement", "", clock, false, getString(R.string.testing), 0, 360, "float");
                 break;
             case "exlap-vehicleSpeed":
-                setupClock(icon,"ic_none","",clock,false,getString(R.string.unit_kmh),0,350,"integer");
+                setupClock(icon, "ic_none", "", clock, false, getString(R.string.unit_kmh), 0, 350, "integer");
                 break;
             case "exlap-Nav_Altitude":
-                setupClock(icon,"ic_altitude","",clock,false,"m",-100,3000,"integer");
+                setupClock(icon, "ic_altitude", "", clock, false, "m", -100, 3000, "integer");
                 break;
             case "exlap-Nav_Heading": // this is a compass, so a little bit more is needed to setup the clock
-                setupClock(icon,"ic_heading","",clock,false,"°",0,360,"integer");
+                setupClock(icon, "ic_heading", "", clock, false, "°", 0, 360, "integer");
                 clock.setUnit(""); //still needs a unit and translation, but haven't found where the unit gets this unit yet.
                 clock.setMarkColor(Color.parseColor("#00FFFFFF"));
 
@@ -1092,7 +1083,7 @@ private void setupClocks(String queryClock, Speedometer clock, TextView icon, Ra
                 clock.setBackgroundResource(swBackgroundResource);
                 break;
             case "exlap-engineSpeed":
-                setupClock(icon,"ic_none",getString(R.string.unit_rpm),clock,true,getString(R.string.unit_rpm1000),0,9,"float");
+                setupClock(icon, "ic_none", getString(R.string.unit_rpm), clock, true, getString(R.string.unit_rpm1000), 0, 9, "float");
 
                 clock.setTicks();
                 clock.setTickTextFormat(0);
@@ -1100,124 +1091,124 @@ private void setupClocks(String queryClock, Speedometer clock, TextView icon, Ra
                 break;
             case "torque-voltage_0xff1238":
             case "exlap-batteryVoltage":
-                setupClock(icon,"ic_battery","",clock,false,getString(R.string.unit_volt),0,17,"float");
+                setupClock(icon, "ic_battery", "", clock, false, getString(R.string.unit_volt), 0, 17, "float");
                 break;
             case "exlap-oilTemperature":
-                setupClock(icon,"ic_oil","",clock,true,"°",0,200,"float");
+                setupClock(icon, "ic_oil", "", clock, true, "°", 0, 200, "float");
                 break;
             case "exlap-coolantTemperature":
-                setupClock(icon,"ic_water","",clock,true,"°",0,200,"float");
+                setupClock(icon, "ic_water", "", clock, true, "°", 0, 200, "float");
                 break;
             case "exlap-outsideTemperature":
-                setupClock(icon,"ic_outsidetemperature","",clock,false,"°",-25,50,"float");
+                setupClock(icon, "ic_outsidetemperature", "", clock, false, "°", -25, 50, "float");
                 break;
             case "exlap-gearboxOilTemperature":
-                setupClock(icon,"ic_gearbox","",clock,false,"°",0,200,"float");
+                setupClock(icon, "ic_gearbox", "", clock, false, "°", 0, 200, "float");
                 break;
             case "torque-turboboost_0xff1202":
             case "exlap-absChargingAirPressure":
             case "exlap-relChargingAirPressure":
-                setupClock(icon,"ic_turbo","",clock,true,pressureUnit,pressureMin,pressureMax,"float");
+                setupClock(icon, "ic_turbo", "", clock, true, pressureUnit, pressureMin, pressureMax, "float");
                 break;
             case "exlap-lateralAcceleration":
-                setupClock(icon,"ic_lateral","",clock,false,getString(R.string.unit_g),-3,3,"float");
+                setupClock(icon, "ic_lateral", "", clock, false, getString(R.string.unit_g), -3, 3, "float");
                 break;
             case "exlap-longitudinalAcceleration":
-                setupClock(icon,"ic_longitudinal","",clock,false,getString(R.string.unit_g),-3,3,"float");
+                setupClock(icon, "ic_longitudinal", "", clock, false, getString(R.string.unit_g), -3, 3, "float");
                 break;
             case "exlap-yawRate":
-                setupClock(icon,"ic_yaw","",clock,false,"°/s",-1,1,"float");
+                setupClock(icon, "ic_yaw", "", clock, false, "°/s", -1, 1, "float");
                 break;
             case "wheelAngle":
-                setupClock(icon,"ic_wheelangle","",clock,false,"°",-45,45,"float");
+                setupClock(icon, "ic_wheelangle", "", clock, false, "°", -45, 45, "float");
                 break;
             case "exlap-EcoHMI_Score.AvgShort":
             case "exlap-EcoHMI_Score.AvgTrip":
-                setupClock(icon,"ic_eco","",clock,false,"",0,100,"integer");
+                setupClock(icon, "ic_eco", "", clock, false, "", 0, 100, "integer");
                 break;
             case "exlap-powermeter":
-                setupClock(icon,"ic_powermeter","",clock,false,"%",0,5000,"integer");
+                setupClock(icon, "ic_powermeter", "", clock, false, "%", 0, 5000, "integer");
                 break;
             case "exlap-acceleratorPosition":
-                setupClock(icon,"ic_pedalposition","",clock,false,"%",0,100,"integer");
+                setupClock(icon, "ic_pedalposition", "", clock, false, "%", 0, 100, "integer");
                 break;
             case "exlap-brakePressure":
-                setupClock(icon,"ic_brakepedalposition","",clock,false,"%",0,100,"integer");
+                setupClock(icon, "ic_brakepedalposition", "", clock, false, "%", 0, 100, "integer");
                 break;
             case "exlap-currentTorque":
-                setupClock(icon,"ic_none","",clock,false,getString(R.string.unit_nm),0,500,"float");
+                setupClock(icon, "ic_none", "", clock, false, getString(R.string.unit_nm), 0, 500, "float");
                 break;
             case "exlap-currentOutputPower":
-                setupClock(icon,"ic_none","",clock,false,getString(R.string.unit_kw),0,500,"float");
+                setupClock(icon, "ic_none", "", clock, false, getString(R.string.unit_kw), 0, 500, "float");
                 break;
             case "exlap-currentConsumptionPrimary":
             case "exlap-cycleConsumptionPrimary":
-                setupClock(icon,"ic_fuelprimary","",clock,false,"l/h",0,100,"float");
+                setupClock(icon, "ic_fuelprimary", "", clock, false, "l/h", 0, 100, "float");
                 break;
             case "exlap-currentConsumptionSecondary":
             case "exlap-cycleConsumptionSecondary":
-                setupClock(icon,"ic_fuelsecondary","",clock,false,"l/h",0,100,"float");
+                setupClock(icon, "ic_fuelsecondary", "", clock, false, "l/h", 0, 100, "float");
                 break;
             case "exlap-tankLevelPrimary":
-                setupClock(icon,"ic_fuelprimary","",clock,false,"%",0,100,"float");
+                setupClock(icon, "ic_fuelprimary", "", clock, false, "%", 0, 100, "float");
                 break;
             case "exlap-tankLevelSecondary":
-                setupClock(icon,"ic_fuelsecondary","",clock,false,"%",0,100,"float");
+                setupClock(icon, "ic_fuelsecondary", "", clock, false, "%", 0, 100, "float");
                 break;
             case "torque-fuelpressure_0x0a":
-                setupClock(icon,"ic_none",getString(R.string.label_fuel),clock,false,"",0,350,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_fuel), clock, false, "", 0, 350, "float");
                 break;
             case "torque-engineload_0x04":
-                setupClock(icon,"ic_none",getString(R.string.label_load),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_load), clock, false, "", 0, 100, "float");
                 break;
             case "torque-timing_advance_0x0e":
-                setupClock(icon,"ic_none",getString(R.string.label_timing),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_timing), clock, false, "", 0, 100, "float");
                 break;
             case "torque-intake_air_temperature_0x0f":
-                setupClock(icon,"ic_none",getString(R.string.label_iat),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_iat), clock, false, "", 0, 100, "float");
                 break;
             case "torque-mass_air_flow_0x10":
-                setupClock(icon,"ic_none",getString(R.string.label_maf),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_maf), clock, false, "", 0, 100, "float");
                 break;
             case "torque-throttle_position_0x11":
-                setupClock(icon,"ic_none",getString(R.string.label_throttle),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_throttle), clock, false, "", 0, 100, "float");
                 break;
             case "torque-AFR_0xff1249":
-                setupClock(icon,"ic_none",getString(R.string.label_afr),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_afr), clock, false, ":1", 0, 100, "float");
                 break;
             case "torque-fueltrimshortterm1_0x06":
-                setupClock(icon,"ic_none",getString(R.string.label_ftst1),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_ftst1), clock, false, "", 0, 100, "float");
                 break;
             case "torque-fueltrimlongterm1_0x07":
-                setupClock(icon,"ic_none",getString(R.string.label_ftlt1),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_ftlt1), clock, false, "", 0, 100, "float");
                 break;
             case "torque-fueltrimshortterm2_0x08":
-                setupClock(icon,"ic_none",getString(R.string.label_ftst2),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_ftst2), clock, false, "", 0, 100, "float");
                 break;
             case "torque-fueltrimlongterm2_0x09":
-                setupClock(icon,"ic_none",getString(R.string.label_ftlt2),clock,false,"",0,100,"float");
+                setupClock(icon, "ic_none", getString(R.string.label_ftlt2), clock, false, "", 0, 100, "float");
                 break;
             case "torque-accelerometer_total_0xff1223":
-                setupClock(icon,"ic_none","",clock,false,"G",-3,3,"float");
+                setupClock(icon, "ic_none", "", clock, false, "G", -3, 3, "float");
                 break;
             case "torque-phonebatterylevel_0xff129a":
-                setupClock(icon,"ic_battery","",clock,false,"G",0,100,"integer");
+                setupClock(icon, "ic_battery", "", clock, false, "%", 0, 100, "integer");
                 break;
             case "torque-phonebarometer_0xff1270":
-                setupClock(icon,"ic_none","",clock,false,"",900,1300,"float");
+                setupClock(icon, "ic_none", "", clock, false, "", 900, 1300, "float");
                 break;
             case "torque-obdadaptervoltage_0xff1238":
-                setupClock(icon,"ic_obd2","",clock,false,"G",0,17,"float");
+                setupClock(icon, "ic_obd2", "", clock, false, "V", 0, 17, "float");
                 break;
             case "torque-hybridbattlevel_0x5b":
-                setupClock(icon,"ic_battery","",clock,false,"G",0,100,"float");
+                setupClock(icon, "ic_battery", "", clock, false, "%", 0, 100, "float");
                 break;
 
         }
 
         // make the icon appear in the color of unitTextColor
         Drawable iconBackground = (Drawable) icon.getBackground();
-        if (iconBackground!=null) {
+        if (iconBackground != null) {
             int iconTint = clock.getUnitTextColor();
             iconBackground.setColorFilter(iconTint, PorterDuff.Mode.SRC_ATOP);
             icon.setBackground(iconBackground);
@@ -1237,7 +1228,8 @@ private void setupClocks(String queryClock, Speedometer clock, TextView icon, Ra
     private void updateClock(String query, Speedometer clock, RaySpeedometer visray, TextView textmax, TextView textmin, Speedometer clockmax, Speedometer clockmin) {
         if (query == null) {
             return;
-        } else {
+
+        } else if (stagingDone == true) {
 
             float randomClockVal = randFloat(0, 360);
             speedFactor = 1f;
@@ -1261,32 +1253,25 @@ private void updateClock(String query, Speedometer clock, RaySpeedometer visray,
             // Get the value that should be put on the clock, depending on the query
             // exlap queries use mLastMeasurements.get(query)
             // torque pid queries use torqueService.getValueForPid(queryPid), queryPid is trimmed from the query string
-            if (queryTrim.equals("torque")){
+            if (queryTrim.equals("torque")) {
                 query = query.substring(query.lastIndexOf('_') + 1);
                 query = query.substring(2);
-                Log.d (TAG, "torque query: " + query);
                 queryPid = new BigInteger(query, 16).longValue();
 
                 try {
                     if (torqueService != null) {
                         clockValue = torqueService.getValueForPid(queryPid, true);
                     }
-                } catch ( Exception e ) {
-                    Log.e(TAG,"Error: " + e.getMessage());
+                } catch (Exception e) {
+                    Log.e(TAG, "Error: " + e.getMessage());
                 }
             } else if (queryTrim.equals("exlap")) {
                 query = query.substring(query.lastIndexOf('-') + 1);
                 clockValue = (Float) mLastMeasurements.get(query);
-                Log.d (TAG, "exlap query: " + query);
-
             } else { // the only other kind of query is the  "random" one.
                 clockValue = randomClockVal;
             }
-            oldValue =  (Float) clock.getSpeed();
-
-            Log.d (TAG, "Main query: " + queryLong);
-
-
+            oldValue = (Float) clock.getSpeed();
             if (clockValue != null) {
                 switch (queryLong) {
                     case "test":
@@ -1399,9 +1384,14 @@ private void updateClock(String query, Speedometer clock, RaySpeedometer visray,
                             if (torqueService != null) {
                                 float torqueData = torqueService.getValueForPid(queryPid, true);
                                 String unitText = torqueService.getUnitForPid(queryPid);
+                                Log.d(TAG,"Query: " + query + " unit: " + unitText);
 
+                                //todo: also get min/max
+                                float torqueMin = torqueService.getMinValueForPid(queryPid);
+                                float torqueMax = torqueService.getMinValueForPid(queryPid);
+                                clock.setMinSpeed(torqueMin);
+                                clock.setMaxSpeed(torqueMax);
                                 clockValue = torqueData;
-                                clock.setUnit(unitText);
                             }
                         } catch (Exception e) {
                             Log.e(TAG, "Error: " + e.getMessage());
@@ -1470,8 +1460,8 @@ private void updateElement(String queryElement, TextView value, TextView label)
                             value.setText(torqueVersion);
                         }
                     }
-                } catch ( Exception e ) {
-                    Log.e(TAG,"Error: " + e.getMessage());
+                } catch (Exception e) {
+                    Log.e(TAG, "Error: " + e.getMessage());
                 }
                 break;
             // the following are torque PIDs.
@@ -1496,10 +1486,10 @@ private void updateElement(String queryElement, TextView value, TextView label)
                     if (torqueService != null) {
                         float torqueData = torqueService.getValueForPid(queryPid, true);
                         String unitText = torqueService.getUnitForPid(queryPid);
-                        value.setText(String.format(Locale.US, getContext().getText(R.string.format_decimals).toString() + unitText,torqueData));
+                        value.setText(String.format(Locale.US, getContext().getText(R.string.format_decimals).toString() + unitText, torqueData));
                     }
-                } catch ( Exception e ) {
-                    Log.e(TAG,"Error: " + e.getMessage());
+                } catch (Exception e) {
+                    Log.e(TAG, "Error: " + e.getMessage());
                 }
                 break;
             // the following torque values should have the unit as label
@@ -1512,11 +1502,11 @@ private void updateElement(String queryElement, TextView value, TextView label)
                     if (torqueService != null) {
                         float torqueData = torqueService.getValueForPid(queryPid, true);
                         String unitText = torqueService.getUnitForPid(queryPid);
-                        value.setText(String.format(Locale.US, getContext().getText(R.string.format_decimals).toString(),torqueData));
+                        value.setText(String.format(Locale.US, getContext().getText(R.string.format_decimals).toString(), torqueData));
                         label.setText(unitText);
                     }
-                } catch ( Exception e ) {
-                    Log.e(TAG,"Error: " + e.getMessage());
+                } catch (Exception e) {
+                    Log.e(TAG, "Error: " + e.getMessage());
                 }
                 break;
 
@@ -1647,7 +1637,7 @@ private void updateElement(String queryElement, TextView value, TextView label)
             case "shortTermConsumptionSecondary":
                 Float mshortConsumption = (Float) mLastMeasurements.get(queryElement);
                 if (mshortConsumption != null) {
-                    value.setText(String.format(Locale.US, "%.1f".toString(),mshortConsumption));
+                    value.setText(String.format(Locale.US, "%.1f".toString(), mshortConsumption));
                 }
                 break;
             case "Nav_CurrentPosition.Longitude":
@@ -1680,11 +1670,11 @@ private void updateElement(String queryElement, TextView value, TextView label)
     }
 
     // set clock label, units, etc.
-    private void setupClock (TextView icon, String iconDrawableName, String iconText, Speedometer clock, Boolean backgroundWithWarningArea, String unit, Integer minspeed, Integer maxspeed, String speedFormat){
+    private void setupClock(TextView icon, String iconDrawableName, String iconText, Speedometer clock, Boolean backgroundWithWarningArea, String unit, Integer minspeed, Integer maxspeed, String speedFormat) {
 
-        Log.d(TAG,"icon: " + icon + " iconDrawableName: " + iconDrawableName);
+        Log.d(TAG, "icon: " + icon + " iconDrawableName: " + iconDrawableName);
 
-        int resId = getResources().getIdentifier(iconDrawableName,"drawable",getContext().getPackageName());
+        int resId = getResources().getIdentifier(iconDrawableName, "drawable", getContext().getPackageName());
         Drawable iconDrawable = getContext().getResources().getDrawable(resId);
 
         TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(new int[]{R.attr.themedEmptyDialBackground});
@@ -1698,15 +1688,15 @@ private void setupClock (TextView icon, String iconDrawableName, String iconText
         clock.setMinMaxSpeed(minspeed, maxspeed);
 
         // determine if an empty background, without red warning area is wanted
-        if (!backgroundWithWarningArea){
+        if (!backgroundWithWarningArea) {
             clock.setBackgroundResource(emptyBackgroundResource);
         }
 
         //determine the clock format
-        if (speedFormat.equals("float")){
+        if (speedFormat.equals("float")) {
             clock.setSpeedTextFormat(Gauge.FLOAT_FORMAT);
 
-        } else if (speedFormat.equals("integer")){
+        } else if (speedFormat.equals("integer")) {
             clock.setSpeedTextFormat(Gauge.INTEGER_FORMAT);
         }
 
@@ -1722,7 +1712,9 @@ private void setupClock (TextView icon, String iconDrawableName, String iconText
         public void onServiceConnected(ComponentName arg0, IBinder service) {
             torqueService = ITorqueService.Stub.asInterface(service);
             postUpdate();
-        };
+        }
+
+        ;
 
         /**
          * What to do when we get disconnected from Torque.
@@ -1731,22 +1723,23 @@ public void onServiceConnected(ComponentName arg0, IBinder service) {
          */
         public void onServiceDisconnected(ComponentName name) {
             torqueService = null;
-        };
+        }
+
+        ;
     };
 
-    private void startTorque ()
-    {
+    private void startTorque() {
         Intent intent = new Intent();
         intent.setClassName("org.prowl.torque", "org.prowl.torque.remote.TorqueService");
         getContext().startService(intent);
-        Log.d(TAG,"Torque start");
+        Log.d(TAG, "Torque start");
 
         boolean successfulBind = getContext().bindService(intent, torqueConnection, 0);
         if (successfulBind) {
-            torqueBind=true;
+            torqueBind = true;
             Log.d("HU", "Connected to torque service!");
         } else {
-            torqueBind=false;
+            torqueBind = false;
             Log.e("HU", "Unable to connect to Torque plugin service");
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15efdd27..12f6c41c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -218,10 +218,10 @@
     <string name="label_maf">MAF</string>
     <string name="label_throttle">Throttle</string>
     <string name="label_afr">AFR</string>
-    <string name="label_ftst1">FTST1</string>
-    <string name="label_ftst2">FTST2</string>
-    <string name="label_ftlt2">FTLT2</string>
-    <string name="label_ftlt1">FTLT1</string>
+    <string name="label_ftst1">FTst1</string>
+    <string name="label_ftst2">FTst2</string>
+    <string name="label_ftlt2">FTlt2</string>
+    <string name="label_ftlt1">FTlt1</string>
     <string name="element_torque_phonebatterylevel">Torque - Phone battery level</string>
     <string name="element_torque_phonebarometer">Torque - Phone barometer</string>
     <string name="element_torque_obdadaptervoltage">Torque - OBD voltage</string>