Fixes #266, typos and improves response-time to emp/disarm.
Merge pull request #319 from Skasi/master

Fixes #266, typos and improves response-time to emp/disarm.