added/improved some more detections; added many tests