diff --git a/devicetypes/ethayer/zwave-lock-reporting.src/zwave-lock-reporting.groovy b/devicetypes/ethayer/zwave-lock-reporting.src/zwave-lock-reporting.groovy
index 3d43c75..83dcb71 100644
--- a/devicetypes/ethayer/zwave-lock-reporting.src/zwave-lock-reporting.groovy
+++ b/devicetypes/ethayer/zwave-lock-reporting.src/zwave-lock-reporting.groovy
@@ -255,10 +255,12 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 			map = [ name: "lock", value: "locked" ]
       map.data = [ usedCode: cmd.alarmLevel ]
       map.descriptionText = "$device.displayName was locked by keypad"
+			break
 		case 24:  // Locked by command (Kwikset 914)
 			map = [ name: "lock", value: "locked" ]
 			map.data = [ usedCode: "command" ]
 			map.descriptionText = "$device.displayName was locked by command"
+			break
 		case 27:  // Autolocked
 			map = [ name: "lock", value: "locked" ]
 			break
diff --git a/smartapps/ethayer/lock.src/lock.groovy b/smartapps/ethayer/lock.src/lock.groovy
index 8081626..6f9ecc8 100644
--- a/smartapps/ethayer/lock.src/lock.groovy
+++ b/smartapps/ethayer/lock.src/lock.groovy
@@ -148,8 +148,8 @@ def notificationPage() {
           input(name: 'notification', type: 'bool', title: 'Send A Push Notification', description: 'Notification', required: false, submitOnChange: true)
         }
         if (phone != null || notification || recipients) {
-          input(name: 'notifyMaunualLock', title: 'On Manual Turn (Lock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/lock.png')
-          input(name: 'notifyMaunualUnlock', title: 'On Manual Turn (Unlock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/unlock-alt.png')
+          input(name: 'notifyManualLock', title: 'On Manual Turn (Lock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/lock.png')
+          input(name: 'notifyManualUnlock', title: 'On Manual Turn (Unlock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/unlock-alt.png')
           if (state.supportsKeypadData) {
             input(name: 'notifyKeypadLock', title: 'On Keypad Press to Lock', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/unlock-alt.png')
           }
@@ -168,8 +168,8 @@ def notificationPage() {
 def askAlexaPage() {
   dynamicPage(name: 'askAlexaPage', title: 'Ask Alexa Message Settings') {
     section('Que Messages with the Ask Alexa app') {
-      input(name: 'alexaMaunualLock', title: 'On Manual Turn (Lock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/lock.png')
-      input(name: 'alexaMaunualUnlock', title: 'On Manual Turn (Unlock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/unlock-alt.png')
+      input(name: 'alexaManualLock', title: 'On Manual Turn (Lock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/lock.png')
+      input(name: 'alexaManualUnlock', title: 'On Manual Turn (Unlock)', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/unlock-alt.png')
       if (state.supportsKeypadData) {
         input(name: 'alexaKeypadLock', title: 'On Keypad Press to Lock', type: 'bool', required: false, image: 'https://dl.dropboxusercontent.com/u/54190708/LockManager/unlock-alt.png')
       }
@@ -327,7 +327,7 @@ def updateCode(event) {
   state.codes["slot${slot}"]['code'] = code
   state.codes["slot${slot}"]['codeState'] = 'known'
 
-  debugger("Recieved: s:${slot} c:${code}")
+  debugger("Received: s:${slot} c:${code}")
 
   // check logic to see if all codes are in known state
   if (!state.refreshComplete) {
@@ -346,7 +346,7 @@ def pollCodeReport(evt) {
   def codeSlots = lockCodeSlots()
   initSlots()
 
-  debugger("Recieved: ${codeData}")
+  debugger("Received: ${codeData}")
   (1..codeSlots).each { slot->
     def code = codeData."code${slot}"
     if (code != null) { //check to make sure code isn't already null, which will cause .isNumber() to error. --DiddyWolf
@@ -423,10 +423,10 @@ def codeUsed(evt) {
       }
 
       message = "${lock.label} was unlocked manually"
-      if (notifyMaunualUnlock) {
+      if (notifyManualUnlock) {
         send(message)
       }
-      if (alexaMaunualUnlock) {
+      if (alexaManualUnlock) {
         send(message)
       }
     }
@@ -473,7 +473,7 @@ def codeUsed(evt) {
         parent.executeHelloPresenceCheck(parent.manualLockRoutine)
       }
 
-      if (notifyMaunualLock) {
+      if (notifyManualLock) {
         send(message)
       }
       if (alexaManualLock) {