diff --git a/web/yaamp/core/backend/bench.php b/web/yaamp/core/backend/bench.php
index 110d808..dce1e7c 100644
--- a/web/yaamp/core/backend/bench.php
+++ b/web/yaamp/core/backend/bench.php
@@ -22,6 +22,11 @@ function BenchUpdateChips()
 	foreach ($benchs as $bench) {
 		if (empty($bench->vendorid) || empty($bench->device)) continue;
 
+		if ($bench->algo == 'x16r') { // not constant, inaccurate
+			$bench->delete();
+			continue;
+		}
+
 		$dups = getdbocount('db_benchmarks', "vendorid=:vid AND client=:client AND os=:os AND driver=:drv AND throughput=:thr AND userid=:uid",
 			array(':vid'=>$bench->vendorid, ':client'=>$bench->client, ':os'=>$bench->os, ':drv'=>$bench->driver,':thr'=>$bench->throughput,':uid'=>$bench->userid)
 		);
@@ -48,6 +53,10 @@ function BenchUpdateChips()
 				$bench->delete();
 				continue;
 			}
+			if ($bench->chip == 'GPU' || $bench->chip == 'Graphics Device') {
+				$bench->delete();
+				continue;
+			}
 			debuglog("bench: {$bench->device} ($chip)...");
 			$bench->save();
 		}
diff --git a/web/yaamp/modules/bench/functions.php b/web/yaamp/modules/bench/functions.php
index 2681997..9e67a95 100644
--- a/web/yaamp/modules/bench/functions.php
+++ b/web/yaamp/modules/bench/functions.php
@@ -163,8 +163,11 @@ function getChipName($row)
 
 	} else {
 
-		// nNidia
-		$words = explode(' ', $row['device']);
+		// nVidia
+		$device = str_replace(' with Max-Q Design', '', $row['device']);
+		$device = str_replace(' COLLECTORS EDITION', '', $device);
+
+		$words = explode(' ', $device);
 		$chip = array_pop($words);
 		$vendorid = $row['vendorid'];
 		if (!is_numeric($chip)) {
@@ -177,6 +180,7 @@ function getChipName($row)
 			$chip = str_replace('760 Ti OEM','760 Ti', $chip);
 			$chip = str_replace(' (Pascal)',' Pascal', $chip);
 			$chip = str_replace('Tesla P100-SXM2-16GB','Tesla P100', $chip);
+			$chip = str_replace('Tesla P100-PCIE-16GB','Tesla P100', $chip);
 			$chip = str_replace('Tesla V100-SXM2-16GB','Tesla V100', $chip);
 			$chip = preg_replace('/ASUS ([6-9]\d\dM)/','\1', $chip); // ASUS 940M
 			$chip = preg_replace('/MSI ([6-9]\d\dM)/','\1', $chip); // MSI 840M