Added Alarm
updates
some more updates