alert checker refactored
minor fixes