diff --git a/gatsby-node.js b/gatsby-node.js
index 5cd8d41..a983290 100644
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -192,9 +192,9 @@ exports.createSchemaCustomization = ({ actions }) => {
       category: String
       price: Int
       restricted: Boolean
-      encumbrance: Int
+      encumbrance: String
       hp: Int
-      rarity: Int
+      rarity: String
       index: String
       generatedId: String!
     }
diff --git a/src/components/WeaponAttachmentsColumnProvider.js b/src/components/WeaponAttachmentsColumnProvider.js
index 60adabf..bc557ed 100644
--- a/src/components/WeaponAttachmentsColumnProvider.js
+++ b/src/components/WeaponAttachmentsColumnProvider.js
@@ -4,52 +4,58 @@ import {
   makeColumns,
   RESTRICTED_COL_INDEX,
   GENERATED_ID_COL_INDEX,
-  indexRender
+  indexRender,
 } from "./shared/ColumnHelper"
 import ProvideBookData from "./shared/BookDataProvider"
 
-export default function WeaponAttachmentsColumnProvider({children, currentBook}){
+export default function WeaponAttachmentsColumnProvider({
+  children,
+  currentBook,
+}) {
   let bookData = ProvideBookData()
-  let columns = makeColumns([
-    {
-      label: "Name",
-      name: "name",
-      options: {
-        customBodyRender: (value, tableMeta) => (
-          <Link
-            to={`/weapon-attachments/${tableMeta.rowData[GENERATED_ID_COL_INDEX]}/`}
-          >
-            {value}
-          </Link>
-        ),
-        sortDirection: "asc",
-        filter: false,
+  let columns = makeColumns(
+    [
+      {
+        label: "Name",
+        name: "name",
+        options: {
+          customBodyRender: (value, tableMeta) => (
+            <Link
+              to={`/weapon-attachments/${tableMeta.rowData[GENERATED_ID_COL_INDEX]}/`}
+            >
+              {value}
+            </Link>
+          ),
+          sortDirection: "asc",
+          filter: false,
+        },
       },
-    },
-    { label: "Category", name: "category" },
-    {
-      label: "Price",
-      name: "price",
-      options: {
-        customBodyRender: (value, tableMeta) =>
-          `${
-            tableMeta.rowData[RESTRICTED_COL_INDEX] ? "(R) " : ""
-          }${value.toLocaleString()}`,
+      { label: "Category", name: "category" },
+      {
+        label: "Price",
+        name: "price",
+        options: {
+          customBodyRender: (value, tableMeta) =>
+            `${
+              tableMeta.rowData[RESTRICTED_COL_INDEX] ? "(R) " : ""
+            }${value.toLocaleString()}`,
+        },
       },
-    },
-    { label: "Encum.", name: "encumbrance" },
-    { label: "HP", name: "hp" },
-    { label: "Rarity", name: "rarity" },
-    {
-      label: "Index",
-      name: "index",
-      options: {
-        filter: false,
-        customBodyRender: (value, tableMeta) =>
-          indexRender(value, tableMeta, bookData, currentBook),
+      { label: "Encum.", name: "encumbrance", options: { sort: false } },
+      { label: "HP", name: "hp" },
+      { label: "Rarity", name: "rarity", options: { sort: false } },
+      {
+        label: "Index",
+        name: "index",
+        options: {
+          filter: false,
+          customBodyRender: (value, tableMeta) =>
+            indexRender(value, tableMeta, bookData, currentBook),
+        },
       },
-    },
-  ], true)
+    ],
+    true
+  )
 
   return React.cloneElement(React.Children.only(children), { columns })
 }
diff --git a/src/components/shared/ColumnHelper.js b/src/components/shared/ColumnHelper.js
index fb6a87d..11a6711 100644
--- a/src/components/shared/ColumnHelper.js
+++ b/src/components/shared/ColumnHelper.js
@@ -15,13 +15,13 @@ export function indexRender(value, tableMeta, bookData, currentBook) {
           .filter(node => node.generatedId === idAndPage[0])
         
         return currentBook !== idAndPage[0] ? (
-          <span key={tableMeta.rowData[GENERATED_ID_COL_INDEX]}>
+          <span key={`${tableMeta.rowData[GENERATED_ID_COL_INDEX]}-${count}`}>
             <Link to={`/books/${idAndPage[0]}/`}>{book[0].name}</Link>:
             {idAndPage[1]}
             {count !== indices.length - 1 ? ", " : ""}
           </span>
         ) : (
-          <span key={tableMeta.rowData[GENERATED_ID_COL_INDEX]}>
+          <span key={`${tableMeta.rowData[GENERATED_ID_COL_INDEX]}-${count}`}>
             {book[0].name}:{idAndPage[1]}
             {count !== indices.length - 1 ? ", " : ""}
           </span>
diff --git a/src/components/shared/Dashboard.js b/src/components/shared/Dashboard.js
index 6f9c87a..875dd18 100644
--- a/src/components/shared/Dashboard.js
+++ b/src/components/shared/Dashboard.js
@@ -246,9 +246,9 @@ export default function Dashboard({ children }) {
                   }}
                   inputProps={{
                     "aria-label": "toolbar search",
-                    autocapitalize: "off",
-                    autocorrect: "off",
-                    autocomplete: "off",
+                    autoCapitalize: "off",
+                    autoCorrect: "off",
+                    autoComplete: "off",
                   }}
                   name="q"
                 />
diff --git a/src/components/shared/Search.js b/src/components/shared/Search.js
index 089c5c4..6adefdf 100644
--- a/src/components/shared/Search.js
+++ b/src/components/shared/Search.js
@@ -71,21 +71,20 @@ export default function SearchComponent({ searchIndex, location }) {
         <Grid container item xs={12}>
           <List>
             {results.map(page => (
-              <>
+              <React.Fragment key={page.generatedId}>
                 <ListItem
                   color="inherit"
                   button
                   component={Link}
                   to={page.link}
-                  key={page.generatedId}
                 >
                   <ListItemText
                     primary={page.name}
                     secondary={page.resourceType}
                   />
                 </ListItem>
-                <Divider component="li" key={`div_${page.generatedId}`} />
-              </>
+                <Divider component="li" />
+              </React.Fragment>
             ))}
           </List>
         </Grid>
diff --git a/src/data/abilities.yaml b/src/data/abilities.yaml
index 2466c8a..b1deacd 100644
--- a/src/data/abilities.yaml
+++ b/src/data/abilities.yaml
@@ -464,7 +464,7 @@
   index: d7a5ca79-8e91-4d2a-bc3e-e158ec42530f:46
   generatedId: a6954fe2-ec15-491d-a191-0f803ffc5d5e
 - name: Four-armed
-  description: The [SPECIES gains [BOOST] on all Brawl checks and may spend [ADVANTAGE][ADVANTAGE] on a successful melee attack to hit a second target engaged with it, dealing the same damage as dealt to the original target.
+  description: The [SPECIES] gains [BOOST] on all Brawl checks and may spend [ADVANTAGE][ADVANTAGE] on a successful melee attack to hit a second target engaged with it, dealing the same damage as dealt to the original target.
   index: 37ee73a9-01c8-440c-a734-ea52e2ff780a:415, cf023ae2-5206-49e0-9e39-550bba0f7f56:101
   generatedId: b9d4dd3b-ceab-4c3c-8c2f-668edd8ceb81
 - name: Frightening Visage
@@ -1223,3 +1223,7 @@
   description: "Add [BOOST] equal to ranks in Trained Mount to a rider's Survival checks while mounted on a [SPECIES]."
   index: 04196a88-99d9-4018-83ef-ca37d68a4869:121
   generatedId: eec8a481-6369-433f-a682-e1e18cd7affa
+- name: Four-armed
+  description: Gains an additional free maneuver per turn, but still may not perform more than two maneuvers per turn.
+  index: cf023ae2-5206-49e0-9e39-550bba0f7f56:101
+  generatedId: 81fafe1e-8829-4776-bd5c-6492f7aa2fc1
diff --git a/src/data/content-status.yaml b/src/data/content-status.yaml
index 10e9123..097786a 100644
--- a/src/data/content-status.yaml
+++ b/src/data/content-status.yaml
@@ -297,8 +297,8 @@
 - book: Allies and Adversaries
   resource: Armor
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Creatures
   source: The Outer Rim
@@ -312,13 +312,13 @@
 - book: Allies and Adversaries
   resource: Gear
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Qualities
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Skills
   source: The Outer Rim
@@ -332,33 +332,33 @@
 - book: Allies and Adversaries
   resource: Starships
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Talents
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Vehicle Attachments
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Vehicles
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Weapon Attachments
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Allies and Adversaries
   resource: Weapons
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Beyond the Rim
   resource: Abilities
   source: Viluppo
@@ -712,8 +712,8 @@
 - book: Collapse of the Republic
   resource: Weapon Attachments
   source: The Outer Rim
-  entered: No
-  audited: No
+  entered: Yes
+  audited: Yes
 - book: Collapse of the Republic
   resource: Weapons
   source: The Outer Rim
@@ -2432,92 +2432,92 @@
 - book: Fully Operational
   resource: Abilities
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Adversaries
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Adversaries Armor
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Adversaries Gear
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Adversaries Weapons
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Armor
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Creatures
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Creatures Weapons
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Gear
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Qualities
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Skills
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Species
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Starships
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Talents
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Vehicle Attachments
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Vehicles
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Weapon Attachments
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Fully Operational
   resource: Weapons
   source: Viluppo
-  entered: Yes
+  entered: No
   audited: No
 - book: Gadgets and Gear
   resource: Abilities
diff --git a/src/data/skills.yaml b/src/data/skills.yaml
index 7b23501..4ebb728 100644
--- a/src/data/skills.yaml
+++ b/src/data/skills.yaml
@@ -82,7 +82,7 @@
 - name: Lightsaber
   characteristic: Brawn
   type: Combat
-  index: 37ee73a9-01c8-440c-a734-ea52e2ff780a:412, d7a5ca79-8e91-4d2a-bc3e-e158ec42530f:23, be0796d8-6ef1-43ec-9fd6-5164e1982bb8:130, cf023ae2-5206-49e0-9e39-550bba0f7f56:36, 47080550-507f-4fa7-b206-f84451a997c6:110, 04196a88-99d9-4018-83ef-ca37d68a4869:36
+  index: 37ee73a9-01c8-440c-a734-ea52e2ff780a:412, d7a5ca79-8e91-4d2a-bc3e-e158ec42530f:23, be0796d8-6ef1-43ec-9fd6-5164e1982bb8:130, cf023ae2-5206-49e0-9e39-550bba0f7f56:36, 47080550-507f-4fa7-b206-f84451a997c6:110, 04196a88-99d9-4018-83ef-ca37d68a4869:36, 5cf48215-d8d4-416b-bcc4-6397af0242eb:6
   generatedId: aed34c1e-1872-4140-b2dd-d98530f2dcb5
 - name: Lore
   characteristic: Intellect
@@ -182,7 +182,7 @@
 - name: Warfare
   characteristic: Intellect
   type: Knowledge
-  index: f34ec89d-b99e-4b0c-b9c6-562894526075:136, cf023ae2-5206-49e0-9e39-550bba0f7f56:36, 47080550-507f-4fa7-b206-f84451a997c6:110, 04196a88-99d9-4018-83ef-ca37d68a4869:36
+  index: f34ec89d-b99e-4b0c-b9c6-562894526075:136, cf023ae2-5206-49e0-9e39-550bba0f7f56:36, 47080550-507f-4fa7-b206-f84451a997c6:110, 04196a88-99d9-4018-83ef-ca37d68a4869:36, 5cf48215-d8d4-416b-bcc4-6397af0242eb:6
   generatedId: a8f9b677-37f8-47b0-bfb1-d5421f904c4b
 - name: Xenology
   characteristic: Intellect
diff --git a/src/data/weapon-attachments.yaml b/src/data/weapon-attachments.yaml
index 3b3650e..6931659 100644
--- a/src/data/weapon-attachments.yaml
+++ b/src/data/weapon-attachments.yaml
@@ -807,7 +807,7 @@
   encumbrance: 3
   hp: 2
   rarity: 6
-  index: 0a591d04-1904-466d-a198-e172a11a424e:52
+  index: 0a591d04-1904-466d-a198-e172a11a424e:52, 04196a88-99d9-4018-83ef-ca37d68a4869:62
   generatedId: 54339f26-6963-492f-b9f8-62b91d84dc3f
 - category: Armor
   name: Optical Camouflage System
@@ -1104,7 +1104,7 @@
   encumbrance: 0
   hp: 2
   rarity: 10
-  index: be0796d8-6ef1-43ec-9fd6-5164e1982bb8:197
+  index: be0796d8-6ef1-43ec-9fd6-5164e1982bb8:197, 04196a88-99d9-4018-83ef-ca37d68a4869:62
   generatedId: 828e057c-c9ce-4101-90a2-5eb6073c937d
 - category: Lightsaber
   name: Kimber Stone
@@ -1268,3 +1268,107 @@
   rarity: 9
   index: d6fa30fe-23f2-47c3-b7c9-a6a17aaee63a:52
   generatedId: 07713662-119f-4370-b294-ae39e2c54b1e
+- category: Grenade and Micro-Rocket Attachments
+  name: Proximity Detonator
+  price: 100
+  encumbrance: "-"
+  hp: 0
+  rarity: 3
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:60
+  generatedId: 0546f707-7b02-4e0f-957f-35f6b014c508
+- category: Ranged Weapon Attachments
+  name: Amplifying Chamber
+  price: 350
+  encumbrance: "-"
+  hp: 1
+  rarity: 4
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:60
+  generatedId: 182aad96-08b5-44e1-8e18-f745fdbd07f2
+- category: Armor
+  name: Portable Plasma Shield
+  price: 2500
+  encumbrance: "-"
+  hp: 2
+  rarity: 4
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:63
+  generatedId: 21d8c2c6-022f-40ec-883f-915afcae8556
+- category: Lightsaber Attachments
+  name: Catastrophic Failure Modification
+  price: 0
+  encumbrance: "-"
+  hp: 0
+  rarity: "-"
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:61
+  generatedId: 49463f99-65af-4994-b1d9-d3bdd6d1b791
+- category: Ranged Weapon Attachments
+  name: Mandalorian Chamber
+  price: 250
+  encumbrance: "-"
+  hp: 1
+  rarity: 5
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:60
+  generatedId: 5c2fd4df-7c8e-42e8-aeba-359c914578de
+- category: Armor
+  name: Retractable Wrist Blades
+  price: 150
+  encumbrance: "-"
+  hp: 1
+  rarity: 1
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:63
+  generatedId: 775fa817-1508-45c3-9603-b99280d93049
+- category: Armor
+  name: Personal Vibrosaw
+  price: 900
+  encumbrance: "-"
+  hp: 1
+  rarity: 1
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:62
+  generatedId: 7a2f26b9-8a11-4003-ab5f-93afdc314df0
+- category: Ranged Weapon Attachments
+  name: Hair Trigger
+  price: 250
+  encumbrance: "-"
+  hp: 1
+  rarity: 2
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:60
+  generatedId: 986d117f-2aac-4f1f-b45f-fc04e3b2e0db
+- category: Armor
+  name: Whipcord Thrower
+  price: 600
+  encumbrance: "-"
+  hp: 1
+  rarity: 1
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:63
+  generatedId: a43395fe-50d2-4f39-887a-d5b43c256372
+- category: Armor
+  name: Clone Polarized Electrobinoculars
+  price: 500
+  encumbrance: "-"
+  hp: 1
+  rarity: 4
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:62
+  generatedId: a48a51dc-1478-4c17-bf5a-835c542b990d
+- category: Ranged Weapon Attachments
+  name: Wrist Mount
+  price: 275
+  encumbrance: "-"
+  hp: 2
+  rarity: 5
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:61
+  generatedId: c9db6047-f3c8-47d5-bd77-8de6cd0f7f3d
+- category: Lightsaber Crystal
+  name: Christophsis Crystal
+  price: 11000
+  encumbrance: "-"
+  hp: 2
+  rarity: 8
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:62
+  generatedId: e68d4001-d318-415b-a8f9-2705f9844116
+- category: Ranged Weapon Attachments
+  name: Bayonet
+  price: 50
+  encumbrance: 1
+  hp: 1
+  rarity: 1
+  index: 04196a88-99d9-4018-83ef-ca37d68a4869:60
+  generatedId: e76e8eba-91f2-40ae-b9a8-67851df5db69
diff --git a/src/pages/index.js b/src/pages/index.js
index f33a39c..d36ef10 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -55,9 +55,9 @@ export default function Index() {
               }}
               inputProps={{
                 "aria-label": "main search",
-                autocapitalize: "off",
-                autocorrect: "off",
-                autocomplete: "off",
+                autoCapitalize: "off",
+                autoCorrect: "off",
+                autoComplete: "off",
               }}
               variant="outlined"
               placeholder="Search..."
diff --git a/src/pages/supporters.js b/src/pages/supporters.js
index a82df45..00c2260 100644
--- a/src/pages/supporters.js
+++ b/src/pages/supporters.js
@@ -23,7 +23,7 @@ const donators = ["Andrew J.", "David B.", "Marshall M."]
 
 const senates = ["Brad K.", "Simon B."]
 const padawans = ["Bryan", "Austin W.", "Randall D."]
-const jedis = ["Brian E."]
+const jedis = ["Brian E.", "Brennan O."]
 
 const Supporters = () => {
   const classes = useStyles()