Various Alarm speed fixes.  DWR Fixes for new data source changes.