2h Weapons and Shields

Fixed a few items that didn't parse.  I now have no outstanding items
that cause issues.