diff --git a/cbpi/cli.py b/cbpi/cli.py
index d2158cc..5b0b4fd 100644
--- a/cbpi/cli.py
+++ b/cbpi/cli.py
@@ -166,7 +166,7 @@ def plugins_add(package_name):
         return
 
     if package_name == 'autostart':
-        print("Add cradtbeerpi.service to systemd")
+        print("Add craftbeerpi.service to systemd")
         try:
             if os.path.exists(os.path.join("/etc/systemd/system","craftbeerpi.service")) is False:
                 srcfile = os.path.join(".", "config", "craftbeerpi.service")
@@ -209,7 +209,7 @@ def plugin_remove(package_name):
         return
 
     if package_name == 'autostart':
-        print("Remove cradtbeerpi.service from systemd")
+        print("Remove craftbeerpi.service from systemd")
         try:
             status = os.popen('systemctl list-units --type=service --state=running | grep craftbeerpi.service').read()
             if status.find("craftbeerpi.service") != -1:
diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py
index 19d911e..c523b47 100644
--- a/cbpi/controller/upload_controller.py
+++ b/cbpi/controller/upload_controller.py
@@ -465,8 +465,12 @@ class UploadController:
                     async with bf_session.get(self.bf_url) as r:
                         bf_recipe = await r.json()
                     await bf_session.close()
-
+            
             if bf_recipe !="":
+                try:
+                    StrikeTemp=bf_recipe['data']['strikeTemp']
+                except:
+                    StrikeTemp = None 
                 RecipeName = bf_recipe['name']
                 BoilTime = bf_recipe['boilTime']
                 mash_steps=bf_recipe['mash']['steps']
@@ -509,6 +513,7 @@ class UploadController:
                             MashIn_Flag = False
 
                         elif self.addmashin == "Yes":
+                            mashin_temp = str(round(StrikeTemp)) if StrikeTemp is not None else step_temp
                             step_type = self.mashin if self.mashin != "" else "MashInStep"
                             Notification = "Target temperature reached. Please add malt."
                             MashIn_Flag = False
@@ -517,7 +522,7 @@ class UploadController:
                                             "AutoMode": self.AutoMode,
                                             "Kettle": self.id,
                                             "Sensor": self.kettle.sensor,
-                                            "Temp": step_temp,
+                                            "Temp": mashin_temp,
                                             "Timer": 0,
                                             "Notification": Notification
                                             },
diff --git a/cbpi/extension/mashstep/__init__.py b/cbpi/extension/mashstep/__init__.py
index 7a17772..f6cf6cc 100644
--- a/cbpi/extension/mashstep/__init__.py
+++ b/cbpi/extension/mashstep/__init__.py
@@ -175,9 +175,12 @@ class MashStep(CBPiStep):
 
         if self.cbpi.kettle is not None and self.timer is None:
             self.timer = Timer(int(self.props.get("Timer",0)) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
-#        elif self.cbpi.kettle is not None and self.timer:
-#            self.timer.start()
-#            self.timer.is_running = True
+        elif self.cbpi.kettle is not None:
+            try:
+                if self.timer.is_running == True:
+                    self.timer.start()
+            except:
+                pass
 
         self.summary = "Waiting for Target Temp"
         await self.push_update()
@@ -245,7 +248,7 @@ class WaitStep(CBPiStep):
         return StepResult.DONE
 
 
-@parameters([Property.Select(label="toggle_type", options=["On", "Off"],description="Choose if Actor shuold be switched on or off in this step"),
+@parameters([Property.Select(label="toggle_type", options=["On", "Off"],description="Choose if Actor should be switched on or off in this step"),
              Property.Actor(label="Actor",description="Actor that should be toggled during this step")])
 class ToggleStep(CBPiStep):
     async def on_timer_done(self, timer):
@@ -374,9 +377,13 @@ class BoilStep(CBPiStep):
 
         if self.cbpi.kettle is not None and self.timer is None:
             self.timer = Timer(int(self.props.get("Timer", 0)) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
-#        elif self.cbpi.kettle is not None and self.timer:
-#            self.timer.start()
-#            self.timer.is_running = True
+
+        elif self.cbpi.kettle is not None:
+            try:
+                if self.timer.is_running == True:
+                    self.timer.start()
+            except:
+                pass
 
         self.summary = "Waiting for Target Temp"
         if self.AutoMode == True: