improving more detections / detected device names
improved more detections
detection improvements
Merge branch 'master' into 3_0