Changes to saving data

Attempt to fix Set up Alarm bug