Added New Switch Item

Added a new switch item for zone in alarm.  Also, fixed some bugs.