Updated so the alarm works.
more fixes