Hopefully fixed a bug where set alarms sometimes would not open.
Some cleanup