diff --git a/internal/classify/rules.go b/internal/classify/rules.go
index 91243e513..d79752131 100644
--- a/internal/classify/rules.go
+++ b/internal/classify/rules.go
@@ -2196,7 +2196,7 @@ var rules = LabelRules{
 		Label:      "outdoor",
 		Threshold:  0.400000,
 		Priority:   0,
-		Categories: []string{"water"},
+		Categories: []string{},
 	},
 	"fountain pen": {
 		Label:      "",
@@ -2361,10 +2361,10 @@ var rules = LabelRules{
 		Categories: []string{"reptile", "animal"},
 	},
 	"go-kart": {
-		Label:      "outdoor",
-		Threshold:  0.300000,
+		Label:      "vehicle",
+		Threshold:  0.400000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"goblet": {
 		Label:      "beverage",
@@ -2392,8 +2392,8 @@ var rules = LabelRules{
 	},
 	"golf ball": {
 		Label:      "",
-		Threshold:  0.000000,
-		Priority:   0,
+		Threshold:  1.000000,
+		Priority:   -2,
 		Categories: []string{},
 	},
 	"golfcart": {
@@ -2968,8 +2968,8 @@ var rules = LabelRules{
 	},
 	"iron": {
 		Label:      "",
-		Threshold:  0.500000,
-		Priority:   0,
+		Threshold:  1.000000,
+		Priority:   -2,
 		Categories: []string{},
 	},
 	"isopod": {
@@ -3226,9 +3226,9 @@ var rules = LabelRules{
 	},
 	"lawn mower": {
 		Label:      "outdoor",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
-		Categories: []string{"vehicle"},
+		Categories: []string{},
 	},
 	"leaf beetle": {
 		Label:      "beetle",
@@ -4264,8 +4264,8 @@ var rules = LabelRules{
 	},
 	"ping-pong ball": {
 		Label:      "",
-		Threshold:  0.000000,
-		Priority:   0,
+		Threshold:  1.000000,
+		Priority:   -2,
 		Categories: []string{},
 	},
 	"pinwheel": {
@@ -5544,7 +5544,7 @@ var rules = LabelRules{
 		Label:      "moment",
 		Threshold:  0.000000,
 		Priority:   0,
-		Categories: []string{"outdoor"},
+		Categories: []string{},
 	},
 	"switch": {
 		Label:      "electronics",
@@ -5626,8 +5626,8 @@ var rules = LabelRules{
 	},
 	"tennis ball": {
 		Label:      "",
-		Threshold:  0.000000,
-		Priority:   0,
+		Threshold:  1.000000,
+		Priority:   -2,
 		Categories: []string{},
 	},
 	"terrapin": {
@@ -6105,8 +6105,8 @@ var rules = LabelRules{
 		Categories: []string{"beverage"},
 	},
 	"water buffalo": {
-		Label:      "",
-		Threshold:  0.200000,
+		Label:      "buffalo",
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"animal", "farm"},
 	},
diff --git a/internal/classify/rules.yml b/internal/classify/rules.yml
index dcbb94e20..ac7753ac1 100644
--- a/internal/classify/rules.yml
+++ b/internal/classify/rules.yml
@@ -1509,7 +1509,8 @@ ox:
     - farm
 
 water buffalo:
-  threshold: 0.2
+  label: buffalo
+  threshold: 0.3
   categories:
     - animal
     - farm
@@ -2228,8 +2229,6 @@ forklift:
 fountain:
   label: outdoor
   threshold: 0.4
-  categories:
-    - water
 
 fountain pen:
   see: ignore
@@ -2252,10 +2251,8 @@ garbage truck:
   threshold: 0.3
 
 go-kart:
-  label: outdoor
-  threshold: 0.3
-  categories:
-    - vehicle
+  label: vehicle
+  threshold: 0.4
 
 golfcart:
   label: outdoor
@@ -2356,8 +2353,7 @@ laptop:
 
 lawn mower:
   label: outdoor
-  categories:
-    - vehicle
+  threshold: 0.3
 
 photography:
   label: photography
@@ -3410,28 +3406,28 @@ ball:
   see: ignore
 
 baseball:
-  see: ball
+  see: ignore
 
 basketball:
-  see: ball
+  see: ignore
 
 golf ball:
-  see: ball
+  see: ignore
 
 ping-pong ball:
-  see: ball
+  see: ignore
 
 rugby ball:
-  see: ball
+  see: ignore
 
 soccer ball:
-  see: ball
+  see: ignore
 
 tennis ball:
-  see: ball
+  see: ignore
 
 volleyball:
-  see: ball
+  see: ignore
 
 spider web:
   see: ignore
@@ -3466,8 +3462,6 @@ packet:
 
 swing:
   label: moment
-  categories:
-    - outdoor
 
 web site:
   label: info
@@ -3875,7 +3869,7 @@ hip:
   threshold: 0.2
 
 iron:
-  threshold: 0.5
+  see: ignore
 
 jinrikisha:
   label: people