Minor fixes
Got basic alarms up and running!