improved some more detections