alerts and refreshes fixed