changes from dzAlerts
fixes to remove dzAlerts reference
updates from other projects