diff --git a/Library/Basic Set/Basic Set Equipment.eqp b/Library/Basic Set/Basic Set Equipment.eqp
index 8aa23474d..6b7db3d6c 100644
--- a/Library/Basic Set/Basic Set Equipment.eqp	
+++ b/Library/Basic Set/Basic Set Equipment.eqp	
@@ -6965,6 +6965,7 @@
 			"type": "equipment",
 			"description": "Force Shield",
 			"reference": "B287",
+			"notes": "+3 DB",
 			"tech_level": "^",
 			"legality_class": "3",
 			"tags": [
@@ -7016,23 +7017,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 3
-				}
-			],
 			"calc": {
 				"extended_value": 1500,
 				"extended_weight": "0.5 lb"
@@ -10694,6 +10678,7 @@
 			"type": "equipment",
 			"description": "Large Shield",
 			"reference": "B287",
+			"notes": "+3 DB; -2 to all attacks with the non-shield hand unless you have Shield-Wall Training",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -10744,23 +10729,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 3
-				}
-			],
 			"calc": {
 				"extended_value": 90,
 				"extended_weight": "25 lb"
@@ -10771,6 +10739,7 @@
 			"type": "equipment",
 			"description": "Large Shield with Spike",
 			"reference": "B287",
+			"notes": "+3 DB; -2 to all attacks with the non-shield hand unless you have Shield-Wall Training",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -10822,23 +10791,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 3
-				}
-			],
 			"calc": {
 				"extended_value": 110,
 				"extended_weight": "30 lb"
@@ -12053,6 +12005,7 @@
 			"type": "equipment",
 			"description": "Light Shield",
 			"reference": "B287",
+			"notes": "+1 DB",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -12103,23 +12056,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
-			],
 			"calc": {
 				"extended_value": 25,
 				"extended_weight": "2 lb"
@@ -12130,6 +12066,7 @@
 			"type": "equipment",
 			"description": "Light Shield with Spike",
 			"reference": "B287",
+			"notes": "+1 DB",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -12181,23 +12118,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 2
-				}
-			],
 			"calc": {
 				"extended_value": 45,
 				"extended_weight": "7 lb"
@@ -13252,6 +13172,7 @@
 			"type": "equipment",
 			"description": "Medium Shield",
 			"reference": "B287",
+			"notes": "+2 DB",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -13300,23 +13221,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 2
-				}
-			],
 			"calc": {
 				"extended_value": 60,
 				"extended_weight": "15 lb"
@@ -13327,6 +13231,7 @@
 			"type": "equipment",
 			"description": "Medium Shield with Spike",
 			"reference": "B287",
+			"notes": "+2 DB",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -13378,23 +13283,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 2
-				}
-			],
 			"calc": {
 				"extended_value": 80,
 				"extended_weight": "20 lb"
@@ -18711,6 +18599,7 @@
 			"type": "equipment",
 			"description": "Small Shield",
 			"reference": "B287",
+			"notes": "+1 DB",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -18761,23 +18650,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
-			],
 			"calc": {
 				"extended_value": 40,
 				"extended_weight": "8 lb"
@@ -18788,6 +18660,7 @@
 			"type": "equipment",
 			"description": "Small Shield with Spike",
 			"reference": "B287",
+			"notes": "+1 DB",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
@@ -18839,23 +18712,6 @@
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
-			],
 			"calc": {
 				"extended_value": 60,
 				"extended_weight": "13 lb"