added/improved more detections