fixing alarms and push Entry