lots of changes -- primarily alarms page