Tweaks and addition of alarms and stuff