fix the alarm issue, add some push notifications