added/imroved some detections; added more tests