Bug Fixes and Alarm adds