fixed alerts, some polish