diff --git a/fishing/black_crappie.json b/fishing/black_crappie.json
index 4762743..b16e583 100644
--- a/fishing/black_crappie.json
+++ b/fishing/black_crappie.json
@@ -2,8 +2,8 @@
 {
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -19,7 +19,7 @@
 			}
 		],
 		"aliases": ["papermouth", "Calico bass", "specks", "speckled perch"],
-		"identification": "Sunfish family. There are two species of crappie—the black and the white. The black crappie is covered with dark, irregular blotches and has seven—rarely eight— dorsal spines. It shows more yellow and green on its sides and its caudal (tail) and anal fins are heavily flecked. The white crappie has six dorsal spines—rarely five—and it has noticeable vertical bars on its silvery sides as well as a light pearlescent color or iridescent blue and lavendar. Both have protruding lower jaws."
+		"identification": "Sunfish family. The black crappie is covered with dark, irregular blotches and has seven—rarely eight—dorsal spines. It shows more yellow and green on its sides and its caudal (tail) and anal fins are heavily flecked. Has protruding lower jaws."
 	},
 	"limits": {
 		"creel": {
@@ -34,10 +34,10 @@
 			"1": {
 				"places": {
 					"Flannagan Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					},
 					"South Holston Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					}
 				},
 				"creel": {
@@ -52,13 +52,13 @@
 			"2": {
 				"places": {
 					"Gaston Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					},
 					"Buggs Island Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					},
 					"New River": {
-						"gnis_id": TK,
+						"gnis_id": null,
 						"restriction": "From the VA–NC state line downstream to the confluence of the New and Little rivers in Grayson County"
 					}
 				}
@@ -67,60 +67,96 @@
 	},
 	"best_fishing": {
 		"lakes": {
-			"Buggs Island": {},
+			"Buggs Island": {
+				"gnis_id": null
+			},
 			"Chesdin": {
-				"gnis_id": 1474230
+				"gnis_id": 1474230,
+				"latitude": 37.2775822,
+				"longitude": -77.6623003
 			},
 			"Chickahominy": {
-				"gnis_id": 1478078
+				"gnis_id": 1478078,
+				"latitude": 37.4037577,
+				"longitude": -76.956077
 			},
 			"Cohoon": {
-				"gnis_id": 1501680
+				"gnis_id": 1502117,
+				"latitude": 36.7572092,
+				"longitude": -76.645278
 			},
 			"Anna": {
-				"gnis_id": 1501942
+				"gnis_id": 1501942,
+				"latitude": 38.0611819,
+				"longitude": -77.8344649
 			},
 			"Smith Mountain": {
-				"gnis_id": 1502131
+				"gnis_id": 1502131,
+				"latitude": 37.062907,
+				"longitude": -79.7660301
 			},
 			"Prince": {
-				"gnis_id": 1502102
+				"gnis_id": 1502102,
+				"latitude": 36.806427,
+				"longitude": -76.6466867
 			},
 			"Gaston": {
-				"gnis_id": 985605
+				"gnis_id": 985605,
+				"latitude": 36.5358582,
+				"longitude": -78.0552001
 			},
 			"Claytor": {
-				"gnis_id": 1501983
+				"gnis_id": 1501983,
+				"latitude": 37.0373452,
+				"longitude": -80.6593262
 			},
 			"Brittle": {
-				"gnis_id": 1501961
+				"gnis_id": 1501961,
+				"latitude": 38.751701,
+				"longitude": -77.6943356
 			},
 			"Moomaw": {
-				"gnis_id": 1502172
+				"gnis_id": 1502172,
+				"latitude": 37.9515137,
+				"longitude": -79.9553351
 			},
 			"Orange": {
-				"gnis_id": 1471939
+				"gnis_id": 1471939,
+				"latitude": 38.2261655,
+				"longitude": -78.0189351
 			},
 			"Burke": {
-				"gnis_id": 1464110
+				"gnis_id": 1464110,
+				"latitude": 38.7626447,
+				"longitude": -77.2992494
 			},
 			"South Holston": {
-				"gnis_id": 1327073
+				"gnis_id": 1327073,
+				"latitude": 36.5585741,
+				"longitude": -82.0043899
 			},
 			"Western Branch": {
-				"gnis_id": 1479861
+				"gnis_id": 1479861,
+				"latitude": 36.8060143,
+				"longitude": -76.6182993
 			}
 		},
 		"rivers": {
 			"Tidal Chickahominy": {
 				"gnis_id": 1478374,
+				"latitude": 37.2334815,
+				"longitude": -76.8896853,
 				"comment": "and its tributaries"
 			},
 			"Tidal James": {
-				"gnis_id": 1488853
+				"gnis_id": 1488853,
+				"latitude": 36.9415369,
+				"longitude": -76.4435588
 			},
 			"South Fork Shenandoah": {
-				"gnis_id": 1487411
+				"gnis_id": 1487411,
+				"latitude": 38.9442772,
+				"longitude": -78.1875001
 			}
 		}
 	},
diff --git a/fishing/species/blue_catfish.json b/fishing/blue_catfish.json
similarity index 87%
rename from fishing/species/blue_catfish.json
rename to fishing/blue_catfish.json
index 2fb1fb8..e18cd7e 100644
--- a/fishing/species/blue_catfish.json
+++ b/fishing/blue_catfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,7 +17,7 @@
 			"humpback blue",
 			"chucklehead"
 		],
-		"identification": "Catfish family. Heavy-bodied with a wide head and high spot forward of center near the head called the dorsal hump. Upper jaw projects well beyond the lower. Bluish-gray body above, fading to white on sides and belly. No spots and a deeply forked tail. Smaller blue cats are often confused with channel catfish. Blue cats are often confused with channel catfish. Small channel cats typically will have spots lacking in small blue cats. However, large channel cats and medium-sized blue cats can be more difficult to tell apart, often having similar coloration and general body shape. The margin, or edge, of the anal fin can be used to identify these fish; blue cats have an anal fin with a very straight margin, in channel cats the anal fin has a rounded margin. Biologists and anglers can definitively distinguish between the two species by counting anal fin rays;30-35 rays in the blue cat's anal fin verses the channel cat's 25 to 29 rays."
+		"identification": "Catfish family. Heavy-bodied with a wide head and high spot forward of center near the head called the dorsal hump. Upper jaw projects well beyond the lower. Bluish-gray body above, fading to white on sides and belly. No spots and a deeply forked tail. Smaller blue cats are often confused with channel catfish. Blue cats are often confused with channel catfish. Small channel cats typically will have spots lacking in small blue cats. However, large channel cats and medium-sized blue cats can be more difficult to tell apart, often having similar coloration and general body shape. The margin, or edge, of the anal fin can be used to identify these fish; blue cats have an anal fin with a very straight margin, in channel cats the anal fin has a rounded margin. Biologists and anglers can definitively distinguish between the two species by counting anal fin rays; 30-35 rays in the blue cat's anal fin verses the channel cat's 25 to 29 rays."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/bluegill.json b/fishing/bluegill.json
similarity index 65%
rename from fishing/species/bluegill.json
rename to fishing/bluegill.json
index 2e642e2..e98992d 100644
--- a/fishing/species/bluegill.json
+++ b/fishing/bluegill.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,7 +17,7 @@
 			"bluegill sunfish",
 			"sun perch"
 		],
-		"identification": "Sunfish family. Colors are variable. Dark green, olive-green, olive brown, or bluish-black on its back, fading to yellowish-green or silvery. Normally has five to seven vertical bars extending down on each side. Lower parts of its cheek and gill cover are bluish. Its “throat” is yellow on females to bright orange on the male, brighter during spawning. Has a black, ear-like flap on its opercle (gill cover) and a black blotch at the back base of its spiny dorsal fin. Typically under 1lb. in Virginia."
+		"identification": "Sunfish family. Colors are variable. Dark green, olive-green, olive brown, or bluish-black on its back, fading to yellowish-green or silvery. Normally has five to seven vertical bars extending down on each side. Lower parts of its cheek and gill cover are bluish. Its “throat” is yellow on females to bright orange on the male, brighter during spawning. Has a black, ear-like flap on its opercle (gill cover) and a black blotch at the back base of its spiny dorsal fin. Typically under 1 lb. in Virginia."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -61,13 +60,10 @@
 				"gnis_id": 1464110,
 				"latitude": 38.7626447,
 				"longitude": -77.2992494
-			},
-			"many others": {
-				"gnis_id": null
 			}
 		},
 		"rivers": {}
 	},
-	"fishing_techniques": "Anumber 8 or 10 hook baited with soft crickets, small nymphs, garden worms, red wigglers, pieces of night crawlers, other grubs and caterpillars on an ultralight spinning or spincasting outfit, fly rod or cane pole provides a lot of fun. Toward evening, in summer, when the shallows cool, bluegills come into shore to feed. When using bait, fish shallow with a small, light bobber in spring, deep near structure in hot summer with no bobber and lightly weighted. Effective artificials include poppers, nymphs, wet and dry flies of many types, rubber spiders, grasshoppers and crickets, and tiny jigs. Flyrodding for bluegills is especially rewarding."
+	"fishing_techniques": "A number 8 or 10 hook baited with soft crickets, small nymphs, garden worms, red wigglers, pieces of night crawlers, other grubs and caterpillars on an ultralight spinning or spincasting outfit, fly rod or cane pole provides a lot of fun. Toward evening, in summer, when the shallows cool, bluegills come into shore to feed. When using bait, fish shallow with a small, light bobber in spring, deep near structure in hot summer with no bobber and lightly weighted. Effective artificials include poppers, nymphs, wet and dry flies of many types, rubber spiders, grasshoppers and crickets, and tiny jigs. Flyrodding for bluegills is especially rewarding."
 }
 ]
diff --git a/fishing/species/bowfin.json b/fishing/bowfin.json
similarity index 89%
rename from fishing/species/bowfin.json
rename to fishing/bowfin.json
index 855b88e..29d893a 100644
--- a/fishing/species/bowfin.json
+++ b/fishing/bowfin.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -67,6 +66,6 @@
 			}
 		}
 	},
-	"fishing_techniques": "They are strong, muscular fighters and strike viscously at all manner of live bait and many artificials. Often fools an angler into thinking it's whipped, and then suddenly explodes back into life. Minnows and a variety of jigs are best baits. Use a good stiff rod with at least 15 lb test line. Steel leaders may be necessary and don't try to lip hold these fish! Food value is generally considered poor."
+	"fishing_techniques": "They are strong, muscular fighters and strike viscously at all manner of live bait and many artificials. Often fools an angler into thinking it's whipped, and then suddenly explodes back into life. Minnows and a variety of jigs are best baits. Use a good stiff rod with at least 15 lb test line. Steel leaders may be necessary and don’t try to lip hold these fish! Food value is generally considered poor."
 }
 ]
diff --git a/fishing/species/brook_trout.json b/fishing/brook_trout.json
similarity index 79%
rename from fishing/species/brook_trout.json
rename to fishing/brook_trout.json
index 0cd415c..61115a0 100644
--- a/fishing/species/brook_trout.json
+++ b/fishing/brook_trout.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -19,7 +18,7 @@
 			"mountain trout",
 			"speckled trout"
 		],
-		"identification": "Trout family. Most colorful of our trout. Back is a dark olivegreen with light wavy or wormy markings. Sides are lighter, sometimes with a bluish cast, yellowish spots and red spots with a light blue halo around them. Belly is white with bright orange fins. Fins have outer edges of white with a black line separating it from the orange.\\nTen to 16 inches and 1 to 2 lbs. is a good-sized brookie. Native brookies seldom grow beyond 12 inches in Virginia streams."
+		"identification": "Trout family. Most colorful of our trout. Back is a dark olive green with light wavy or wormy markings. Sides are lighter, sometimes with a bluish cast, yellowish spots and red spots with a light blue halo around them. Belly is white with bright orange fins. Fins have outer edges of white with a black line separating it from the orange. Ten to 16 inches and 1 to 2 lbs. is a good-sized brookie. Native brookies seldom grow beyond 12 inches in Virginia streams."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/brown_trout.json b/fishing/brown_trout.json
similarity index 86%
rename from fishing/species/brown_trout.json
rename to fishing/brown_trout.json
index 3f3c8e4..7eba466 100644
--- a/fishing/species/brown_trout.json
+++ b/fishing/brown_trout.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -60,12 +59,6 @@
 				"gnis_id": 1023457,
 				"latitude": 36.4806937,
 				"longitude": -79.7511464
-			},
-			"a wide array of others on either side of the Blue Ridge": {
-				"gnis_id": null
-			},
-			"in Southwestern Virginia": {
-				"gnis_id": null
 			}
 		}
 	},
diff --git a/fishing/species/carp.json b/fishing/carp.json
similarity index 92%
rename from fishing/species/carp.json
rename to fishing/carp.json
index 8bc0b40..d5e5d00 100644
--- a/fishing/species/carp.json
+++ b/fishing/carp.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
diff --git a/fishing/species/chain_pickerel.json b/fishing/chain_pickerel.json
similarity index 72%
rename from fishing/species/chain_pickerel.json
rename to fishing/chain_pickerel.json
index 7c967b8..f0a9d81 100644
--- a/fishing/species/chain_pickerel.json
+++ b/fishing/chain_pickerel.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,7 +17,7 @@
 			"jackpike",
 			"pike"
 		],
-		"identification": "Pike family. Amember of the pike family, it is named for its chain-like markings on its sides. Also has a black vertical mark under its eye. Normally its fin is unmarked.\\nAverages 1.5 to 3 lbs. Fully scaled on both cheek and gill cover."
+		"identification": "Pike family. A member of the pike family, it is named for its chain-like markings on its sides. Also has a black vertical mark under its eye. Normally its fin is unmarked. Averages 1.5 to 3 lbs. Fully scaled on both cheek and gill cover."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -78,15 +77,6 @@
 				"gnis_id": 1483077,
 				"latitude": 37.9058696,
 				"longitude": -79.800276
-			},
-			"many other rivers": {
-				"gnis_id": null
-			},
-			"ponds": {
-				"gnis_id": null
-			},
-			"lakes": {
-				"gnis_id": null
 			}
 		},
 		"rivers": {
@@ -112,6 +102,6 @@
 			}
 		}
 	},
-	"fishing_techniques": "Best time is from October through March.\\nMost active when water temperatures are 55° to 70°F. Spinners, spoons, bucktails, jigs, pork rind baits and a variety of crankbaits will take pickerel. Minnows are the best live bait. Fish the edges of weed beds, lily pad beds, sunken brush or tree stumps."
+	"fishing_techniques": "Best time is from October through March. Most active when water temperatures are 55° to 70°F. Spinners, spoons, bucktails, jigs, pork rind baits and a variety of crankbaits will take pickerel. Minnows are the best live bait. Fish the edges of weed beds, lily pad beds, sunken brush or tree stumps."
 }
 ]
diff --git a/fishing/species/channel_catfish.json b/fishing/channel_catfish.json
similarity index 78%
rename from fishing/species/channel_catfish.json
rename to fishing/channel_catfish.json
index cbacab7..bc85ee0 100644
--- a/fishing/species/channel_catfish.json
+++ b/fishing/channel_catfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -19,7 +18,7 @@
 			"silver catfish",
 			"fork-tailed catfish"
 		],
-		"identification": "Catfish family. Deeply forked tail. Upper jaw is longer than, and overlaps the lower.\\nWhen small, its smooth-skinned body is usually spotted; however, these spots disappear in older fish (can be confused with blue catfish, see identification of blue catfish). Has a small dorsal fin with stiff spine standing high on its back. Varies in color, although generally dark brownish to slate-gray on top, fading to light brownish-gray on the sides. Has 25 to 29 rays in its anal fin."
+		"identification": "Catfish family. Deeply forked tail. Upper jaw is longer than, and overlaps the lower. When small, its smooth-skinned body is usually spotted; however, these spots disappear in older fish (can be confused with blue catfish, see identification of blue catfish). Has a small dorsal fin with stiff spine standing high on its back. Varies in color, although generally dark brownish to slate-gray on top, fading to light brownish-gray on the sides. Has 25 to 29 rays in its anal fin."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -57,9 +56,6 @@
 				"gnis_id": 1484463,
 				"latitude": 37.1767904,
 				"longitude": -82.3933472
-			},
-			"most small public lakes": {
-				"gnis_id": null
 			}
 		},
 		"rivers": {
diff --git a/fishing/species/flathead_catfish.json b/fishing/flathead_catfish.json
similarity index 91%
rename from fishing/species/flathead_catfish.json
rename to fishing/flathead_catfish.json
index 609730a..fc9d4eb 100644
--- a/fishing/species/flathead_catfish.json
+++ b/fishing/flathead_catfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
diff --git a/fishing/species/flier.json b/fishing/flier.json
similarity index 76%
rename from fishing/species/flier.json
rename to fishing/flier.json
index f6028db..8d3c27a 100644
--- a/fishing/species/flier.json
+++ b/fishing/flier.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"Round sunfihs",
 			"millpond flier"
 		],
-		"identification": "Sunfish family. A deep-bodied, almost round fish, with many spines on both dorsal and anal fins.\\nColor is a yellow-green, or brassy-olive, to brownishgold, with a dark brown to black spot on each scale, appearing of rows of spots. Adark vertical streak extends downward from the eye to the lower edge of its cheek. It has large, rounded fins, much like a crappie, with a head and mouth similar in shape to a bluegill's. Slow growing, they reach up to 10 inches in length."
+		"identification": "Sunfish family. A deep-bodied, almost round fish, with many spines on both dorsal and anal fins. Color is a yellow-green, or brassy-olive, to brownishgold, with a dark brown to black spot on each scale, appearing of rows of spots. Adark vertical streak extends downward from the eye to the lower edge of its cheek. It has large, rounded fins, much like a crappie, with a head and mouth similar in shape to a bluegill’s. Slow growing, they reach up to 10 inches in length."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/freshwater_drum.json b/fishing/freshwater_drum.json
similarity index 64%
rename from fishing/species/freshwater_drum.json
rename to fishing/freshwater_drum.json
index 7d68965..8d569a0 100644
--- a/fishing/species/freshwater_drum.json
+++ b/fishing/freshwater_drum.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"Drum",
 			"sheepshead"
 		],
-		"identification": "Freshwater drum have a humped back, stout body and large scales.\\nThe fins and body are silvery brown. The trailing edge of the caudal fin is rounded or almost triangular."
+		"identification": "Freshwater drum have a humped back, stout body and large scales. The fins and body are silvery brown. The trailing edge of the caudal fin is rounded or almost triangular."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -40,6 +39,6 @@
 			}
 		}
 	},
-	"fishing_techniques": "Most anglers use live bait (crayfish and small minnows), but drum will hit artificial lures that imitate their preferred prey. Light or medium tackle is best.\\nFish on the bottom in deeper pools in rivers or on drop-offs and points in Buggs Island Lake."
+	"fishing_techniques": "Most anglers use live bait (crayfish and small minnows), but drum will hit artificial lures that imitate their preferred prey. Light or medium tackle is best. Fish on the bottom in deeper pools in rivers or on drop-offs and points in Buggs Island Lake."
 }
 ]
diff --git a/fishing/species/green_sunfish.json b/fishing/green_sunfish.json
similarity index 85%
rename from fishing/species/green_sunfish.json
rename to fishing/green_sunfish.json
index 61f7dd5..64d3bae 100644
--- a/fishing/species/green_sunfish.json
+++ b/fishing/green_sunfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
diff --git a/fishing/species/hybrid_striped bass.json b/fishing/hybrid_striped bass.json
similarity index 65%
rename from fishing/species/hybrid_striped bass.json
rename to fishing/hybrid_striped bass.json
index 769bcb2..53f0523 100644
--- a/fishing/species/hybrid_striped bass.json	
+++ b/fishing/hybrid_striped bass.json	
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"hybrid",
 			"hybrid striper"
 		],
-		"identification": "Striped Bass family. This is a striped bass x white bass cross, with a body shape between that of striper and white bass. Silvery-white with up to 8 dark broken stripes; first stripe below lateral line complete to tail. Tongue tooth patches are intermediate between white and striped bass. Typically less than 10 lbs."
+		"identification": "Striped Bass family. This is a striped bass × white bass cross, with a body shape between that of striper and white bass. Silvery-white with up to 8 dark broken stripes; first stripe below lateral line complete to tail. Tongue tooth patches are intermediate between white and striped bass. Typically less than 10 lbs."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/largemouth_bass.json b/fishing/largemouth_bass.json
index cb0ed0c..6281913 100644
--- a/fishing/largemouth_bass.json
+++ b/fishing/largemouth_bass.json
@@ -2,8 +2,8 @@
 {
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -32,7 +32,7 @@
 			"1": {
 				"places": {
 					"Briery Creek Lake": {
-						"gnis_id": TK
+						"gnis_id": null
 					}
 				},
 				"description": "No bass 16 to 24 inches, only 1 per day longer than 24 inches"
@@ -40,7 +40,7 @@
 			"2": {
 				"places": {
 					"Buggs Island": {
-						"gnis_id": TK
+						"gnis_id": null
 					}
 				},
 				"description": "Only 2 of 5 bass less than 14 inches"
@@ -48,43 +48,66 @@
 		}
 	},
 	"best_fishing": {
+		"description": "Lakes: Anna, Gaston, Buggs Island, Chickahominy, Chesdin, Smith Mountain, Prince, Briery Creek, Western Branch and Flannagan. Rivers: Chickahominy (below Walkers Dam) and James (below the fall line).",
 		"lakes": {
 			"Anna": {
-				"gnis_id": 1501942
+				"gnis_id": 1501942,
+				"latitude": 38.0611819,
+				"longitude": -77.8344649
 			},
 			"Gaston": {
-				"gnis_id": 1500911
+				"gnis_id": 985605,
+				"latitude": 36.5358582,
+				"longitude": -78.0552001
+			},
+			"Buggs Island": {
+				"gnis_id": null
 			},
-			"Buggs Island": {},
 			"Chickahominy": {
-				"gnis_id": 1478078
+				"gnis_id": 1478078,
+				"latitude": 37.4037577,
+				"longitude": -76.956077
 			},
 			"Chesdin": {
-				"gnis_id": 1474230
+				"gnis_id": 1474230,
+				"latitude": 37.2775822,
+				"longitude": -77.6623003
 			},
 			"Smith Mountain": {
-				"gnis_id": 1502131
+				"gnis_id": 1502131,
+				"latitude": 37.062907,
+				"longitude": -79.7660301
 			},
 			"Prince": {
-				"gnis_id": 1502102
+				"gnis_id": 1502102,
+				"latitude": 36.806427,
+				"longitude": -76.6466867
+			},
+			"Briery Creek": {
+				"gnis_id": null
 			},
-			"Briery Creek": {},
-			"Sandy River": {},
 			"Western Branch": {
-				"gnis_id": 1479861
+				"gnis_id": 1479861,
+				"latitude": 36.8060143,
+				"longitude": -76.6182993
 			},
-			"Witten": {},
 			"Flannagan": {
-				"gnis_id": 1484463
+				"gnis_id": 1484463,
+				"latitude": 37.1767904,
+				"longitude": -82.3933472
 			}
 		},
 		"rivers": {
 			"Chickahominy": {
 				"gnis_id": 1478374,
+				"latitude": 37.2334815,
+				"longitude": -76.8896853,
 				"comment": "below Walkers Dam"
 			},
 			"James": {
 				"gnis_id": 1488853,
+				"latitude": 36.9415369,
+				"longitude": -76.4435588,
 				"comment": "below the fall line"
 			}
 		}
diff --git a/fishing/species/longnose_gar.json b/fishing/longnose_gar.json
similarity index 91%
rename from fishing/species/longnose_gar.json
rename to fishing/longnose_gar.json
index 3a0386c..ca80897 100644
--- a/fishing/species/longnose_gar.json
+++ b/fishing/longnose_gar.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
diff --git a/fishing/species/muskellunge.json b/fishing/muskellunge.json
similarity index 79%
rename from fishing/species/muskellunge.json
rename to fishing/muskellunge.json
index 75d1262..e730ea3 100644
--- a/fishing/species/muskellunge.json
+++ b/fishing/muskellunge.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"musky",
 			"muskie"
 		],
-		"identification": "Pike family. Largest member of the pike family. Normally olive to dark gray on its back, with grayish to bluish to yellowish sides.\\nSides may have faint vertical bars, spots or blotches."
+		"identification": "Pike family. Largest member of the pike family. Normally olive to dark gray on its back, with grayish to bluish to yellowish sides. Sides may have faint vertical bars, spots or blotches."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -72,6 +71,6 @@
 			}
 		}
 	},
-	"fishing_techniques": "River fishermen use small boats with electric motors or small outboards to float larger pools and fish shoreline snags and submerged brush. Heavy bait casting rods and reels with 30+ lb. test line is used. Using large hooks, 4/0 or larger, some anglers simply allow 8 or 12-inch suckers, shad or carp to swim free.\\nMuskies are commonly caught in lakes by trolling deep water with large crankbaits, spoons andspinner-bucktail combinations. Early in the year, try trolling across shallow points."
+	"fishing_techniques": "River fishermen use small boats with electric motors or small outboards to float larger pools and fish shoreline snags and submerged brush. Heavy bait casting rods and reels with 30+ lb. test line is used. Using large hooks, 4/0 or larger, some anglers simply allow 8 or 12-inch suckers, shad or carp to swim free. Muskies are commonly caught in lakes by trolling deep water with large crankbaits, spoons and spinner-bucktail combinations. Early in the year, try trolling across shallow points."
 }
 ]
diff --git a/fishing/species/northern_pike.json b/fishing/northern_pike.json
similarity index 68%
rename from fishing/species/northern_pike.json
rename to fishing/northern_pike.json
index 8421cc4..a7e1ccc 100644
--- a/fishing/species/northern_pike.json
+++ b/fishing/northern_pike.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,7 +17,7 @@
 			"pickerel",
 			"jackfish"
 		],
-		"identification": "Pike family. Member of the pike family (Esoxidae). A long, lean body, generally olive or dark green above fading to a light olive or gray-green to yellowish-green then to white on its belly. Its sides have light yellowish bean-shaped spots the length of its body.\\nStrongly toothed jaws have teeth arranged in rows, plus rows of teeth located on its tongue and palate; they angle inward so its prey cannot get loose. Cheek is fully scaled, gill cover is only half scaled."
+		"identification": "Pike family. Member of the pike family (Esoxidae). A long, lean body, generally olive or dark green above fading to a light olive or gray-green to yellowish-green then to white on its belly. Its sides have light yellowish bean-shaped spots the length of its body. Strongly toothed jaws have teeth arranged in rows, plus rows of teeth located on its tongue and palate; they angle inward so its prey cannot get loose. Cheek is fully scaled, gill cover is only half scaled."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -39,10 +38,11 @@
 				"latitude": 38.3145242,
 				"longitude": -77.5539564
 			},
-			"Arrowhead (Page)": {
-				"gnis_id": 1462560,
-				"latitude": 38.5001243,
-				"longitude": -77.5447077
+			"Arrowhead": {
+				"gnis_id": 1490537,
+				"latitude": 38.6408087,
+				"longitude": -78.388898,
+				"comment": "Page County"
 			}
 		},
 		"rivers": {}
diff --git a/fishing/species/pumpkinseed.json b/fishing/pumpkinseed.json
similarity index 66%
rename from fishing/species/pumpkinseed.json
rename to fishing/pumpkinseed.json
index ba6c302..4227fc6 100644
--- a/fishing/species/pumpkinseed.json
+++ b/fishing/pumpkinseed.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,11 +17,11 @@
 			"sun perch",
 			"sunny"
 		],
-		"identification": "Sunfish family. Dark, olive-green on its back, with mottled sides. Base color of sides, yellowish, spotted with orange, red and blue. Its belly is yellow to bright orange.\\nCheeks and gill covers marked with alternate worm-shaped bands of blue-green and yellow. Bluish-black gill cover flaps are edged with white, yellow, orange or blue, with a small half moon spot of red. Average 4 to 6 inches."
+		"identification": "Sunfish family. Dark, olive-green on its back, with mottled sides. Base color of sides, yellowish, spotted with orange, red and blue. Its belly is yellow to bright orange. Cheeks and gill covers marked with alternate worm-shaped bands of blue-green and yellow. Bluish-black gill cover flaps are edged with white, yellow, orange or blue, with a small half moon spot of red. Average 4 to 6 inches."
 	},
 	"limits": {},
 	"best_fishing": {
-		"description": "Most lakes, ponds and rivers. Best time to catch them is in spring and early summer when they move into the shallows to spawn, but are cooperative even in the hot summertime and is commonly caught near shore throughout the warmer months.",
+		"description": "Most lakes, ponds and rivers.",
 		"lakes": {},
 		"rivers": {}
 	},
diff --git a/fishing/species/rainbow_trout.json b/fishing/rainbow_trout.json
similarity index 89%
rename from fishing/species/rainbow_trout.json
rename to fishing/rainbow_trout.json
index 0fcf81f..a81783a 100644
--- a/fishing/species/rainbow_trout.json
+++ b/fishing/rainbow_trout.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -77,15 +76,17 @@
 			"Big Tumbling Creek": {
 				"gnis_id": null
 			},
-			"many others on both sides of the Blue Ridge Some good wild streams are Whitetop Laurel": {
-				"gnis_id": null
+			"Whitetop Laurel": {
+				"gnis_id": 1488344,
+				"latitude": 36.6237277,
+				"longitude": -81.7648406
 			},
 			"Fox Creek": {
 				"gnis_id": 1466824,
 				"latitude": 37.3859772,
 				"longitude": -76.6421774
 			},
-			"the South Fork Holston River": {
+			"South Fork Holston River": {
 				"gnis_id": 1327068,
 				"latitude": 36.5476,
 				"longitude": -82.6118209
diff --git a/fishing/species/redbreast_sunfish.json b/fishing/redbreast_sunfish.json
similarity index 85%
rename from fishing/species/redbreast_sunfish.json
rename to fishing/redbreast_sunfish.json
index 75399cb..f62f404 100644
--- a/fishing/species/redbreast_sunfish.json
+++ b/fishing/redbreast_sunfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,7 +17,7 @@
 			"redbelly",
 			"red throat"
 		],
-		"identification": "Sunfish family. Basically olive to brownish gray along the back, merging to blue with a golden cast along its sides and a bright orange to yellow underside.\\nHas several irregular bluish stripes on its cheek and gill cover. Identifiable by a long, black opercular(gill) flap. Reaches about 8 inches."
+		"identification": "Sunfish family. Basically olive to brownish gray along the back, merging to blue with a golden cast along its sides and a bright orange to yellow underside.\\nHas several irregular bluish stripes on its cheek and gill cover. Identifiable by a long, black opercular (gill) flap. Reaches about 8 inches."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/redear_sunfish.json b/fishing/redear_sunfish.json
similarity index 90%
rename from fishing/species/redear_sunfish.json
rename to fishing/redear_sunfish.json
index 0d64d25..7b15d66 100644
--- a/fishing/species/redear_sunfish.json
+++ b/fishing/redear_sunfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -20,7 +19,7 @@
 	},
 	"limits": {},
 	"best_fishing": {
-		"description": "Lakes: Cohoon, Meade, Prince, Little Creek, Chickahominy, Robertson, Western Branch, Lone Star, and Briery Creek.Rivers: Nottoway.",
+		"description": "Lakes: Cohoon, Meade, Prince, Little Creek, Chickahominy, Robertson, Western Branch, Lone Star, and Briery Creek. Rivers: Nottoway.",
 		"lakes": {
 			"Cohoon": {
 				"gnis_id": 1502117,
diff --git a/fishing/species/roanoke_bass.json b/fishing/roanoke_bass.json
similarity index 68%
rename from fishing/species/roanoke_bass.json
rename to fishing/roanoke_bass.json
index a519446..eadf91f 100644
--- a/fishing/species/roanoke_bass.json
+++ b/fishing/roanoke_bass.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,19 +16,21 @@
 			"Redeye",
 			"rock bass"
 		],
-		"identification": "Sunfish family. Robust body much like the rock bass but with dark, olivegreen to olivebrown back, fading to grayish sides and white belly. Has smaller scale spots than the rock bass and lighter small whitish or yellowish spots on its upper body. Has a slightly concave outline over the eyes.\\nChecks scaleless or nearly so."
+		"identification": "Sunfish family. Robust body much like the rock bass but with dark, olivegreen to olivebrown back, fading to grayish sides and white belly. Has smaller scale spots than the rock bass and lighter small whitish or yellowish spots on its upper body. Has a slightly concave outline over the eyes. Checks scaleless or nearly so. Most of the trophy “rock bass” registered by anglers are really Roanoke bass."
 	},
 	"limits": {},
 	"best_fishing": {
-		"description": "Rivers: Meherrin, Nottoway, Blackwater, of the Chowan drainage; Roanoke/Staunton, Blackwater and Pigg of the Roanoke drainage. Lakes: Leesville Reservoir, Smith Mountain. Most of the trophy “rock bass” registered by anglers are really Roanoke bass.",
+		"description": "Rivers: Meherrin, Nottoway, Blackwater, of the Chowan drainage; Roanoke/Staunton, Blackwater and Pigg of the Roanoke drainage. Lakes: Leesville Reservoir, Smith Mountain.",
 		"lakes": {
 			"Leesville Reservoir": {
 				"gnis_id": 1490560,
 				"latitude": 37.0868104,
 				"longitude": -79.4014153
 			},
-			"Smith Mountain Most of the trophy “rock bass” registered by anglers are really Roanoke bass.": {
-				"gnis_id": null
+			"Smith Mountain": {
+				"gnis_id": 1502131,
+				"latitude": 37.062907,
+				"longitude": -79.7660301
 			}
 		},
 		"rivers": {
@@ -46,10 +47,8 @@
 			"Blackwater": {
 				"gnis_id": 1277619,
 				"latitude": 36.5442572,
-				"longitude": -83.0976705
-			},
-			"of the Chowan drainage": {
-				"gnis_id": null
+				"longitude": -83.0976705,
+				"comment": "of the Chowan drainage"
 			},
 			"Roanoke": {
 				"gnis_id": 1473295,
@@ -61,8 +60,11 @@
 				"latitude": 38.4437377,
 				"longitude": -78.3691724
 			},
-			"Pigg of the Roanoke drainage": {
-				"gnis_id": null
+			"Pigg": {
+				"gnis_id": 1472296,
+				"latitude": 37.0051451,
+				"longitude": -79.4814168,
+				"comment": "of the Roanoke drainage"
 			}
 		}
 	},
diff --git a/fishing/species/rock_bass.json b/fishing/rock_bass.json
similarity index 79%
rename from fishing/species/rock_bass.json
rename to fishing/rock_bass.json
index 816b5d9..a0d1886 100644
--- a/fishing/species/rock_bass.json
+++ b/fishing/rock_bass.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -18,7 +17,7 @@
 			"google eye",
 			"rock sunfish"
 		],
-		"identification": "Sunfish family. Short, robust body and fairly large mouth. Lower jaw protrudes slightly. Back is olive-green with sides tarnished gold or brassy colored.\\nEach scale has a dark central spot. Large spots on its lower body forms a striped-like appearance.\\nHas a discernable dark outline on its anal fin. Has wide vertical blotches on its sides and a dark spot on its cheek. Average 6 to 8 inches, but will reach 12 to 14 inches and 11/2 to 2 lbs. Checks with obvious sacles."
+		"identification": "Sunfish family. Short, robust body and fairly large mouth. Lower jaw protrudes slightly. Back is olive-green with sides tarnished gold or brassy colored. Each scale has a dark central spot. Large spots on its lower body forms a striped-like appearance. Has a discernable dark outline on its anal fin. Has wide vertical blotches on its sides and a dark spot on its cheek. Average 6 to 8 inches, but will reach 12 to 14 inches and 11/2 to 2 lbs. Checks with obvious sacles."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/sauger.json b/fishing/sauger.json
similarity index 62%
rename from fishing/species/sauger.json
rename to fishing/sauger.json
index 3629c82..a5b0c29 100644
--- a/fishing/species/sauger.json
+++ b/fishing/sauger.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"sand pike",
 			"jack salmon"
 		],
-		"identification": "Perch family. A member of the perch family, very similar to walleye.\\nIts best identifying marks are its spotted spiny dorsal. Its body colors are more of a dusky-brown to yellowish-olive, with large, irregular patches on its side, peppered in between with smaller dark markings and a white underside. Very slim build in comparison to walleye. Has a silvery, reflective eye similar to the walleye's, and a mouth full of canine teeth. When handled, it flares out its gills, flattens its head and shivers as if bracing itself for the hook removal.\\nTypically 10 to 19 inches."
+		"identification": "Perch family. A member of the perch family, very similar to walleye. Its best identifying marks are its spotted spiny dorsal. Its body colors are more of a dusky-brown to yellowish-olive, with large, irregular patches on its side, peppered in between with smaller dark markings and a white underside. Very slim build in comparison to walleye. Has a silvery, reflective eye similar to the walleye’s, and a mouth full of canine teeth. When handled, it flares out its gills, flattens its head and shivers as if bracing itself for the hook removal. Typically 10 to 19 inches."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/smallmouth_bass.json b/fishing/smallmouth_bass.json
similarity index 85%
rename from fishing/species/smallmouth_bass.json
rename to fishing/smallmouth_bass.json
index 4526e58..5a83bc0 100644
--- a/fishing/species/smallmouth_bass.json
+++ b/fishing/smallmouth_bass.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -50,10 +49,11 @@
 			}
 		},
 		"rivers": {
-			"James (above the fall line)": {
+			"James": {
 				"gnis_id": 1488853,
 				"latitude": 36.9415369,
-				"longitude": -76.4435588
+				"longitude": -76.4435588,
+				"comment": "above the fall line"
 			},
 			"New": {
 				"gnis_id": 1552301,
@@ -70,15 +70,17 @@
 				"latitude": 36.6334731,
 				"longitude": -78.7119491
 			},
-			"mainstem Shenandoah": {
+			"Shenandoah": {
 				"gnis_id": 1556740,
 				"latitude": 39.3226009,
-				"longitude": -77.7277704
+				"longitude": -77.7277704,
+				"comment": "mainstem"
 			},
-			"Rappahannock (above the fall line)": {
+			"Rappahannock": {
 				"gnis_id": 1479404,
 				"latitude": 37.5876333,
-				"longitude": -76.2891091
+				"longitude": -76.2891091,
+				"comment": "above the fall line"
 			},
 			"Maury": {
 				"gnis_id": 1485231,
diff --git a/fishing/species/black_crappie.json b/fishing/species/black_crappie.json
deleted file mode 100644
index 480afd7..0000000
--- a/fishing/species/black_crappie.json
+++ /dev/null
@@ -1,125 +0,0 @@
-[
-{
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
-	"state": "Virginia",
-	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
-	"schema": "",
-	"schema_version": "1.0a",
-	"documentation": "",
-	"species": {
-		"name": "Black Crappie",
-		"taxonomy": "Pomoxis nigromaculatus",
-		"bova_id": 10190,
-		"images": [],
-		"aliases": [
-			"papermouth",
-			"Calico bass",
-			"specks",
-			"speckled perch"
-		],
-		"identification": "Sunfish family. white. The black crappie is covered with dark, irregular blotches and has seven-rarely eight-dorsal spines. It shows more yellowish and greenish on its sides and its caudal (tail) and anal fins are heavily flecked."
-	},
-	"limits": {},
-	"best_fishing": {
-		"description": "Lakes: Buggs Island, Chesdin, Chickahominy, Cohoon, Anna, Smith Mountain, Prince, Gaston, Claytor, Brittle, Moomaw, Orange, Burke, South Holston, and Western Branch. Rivers: tidal Chickahominy and its tributaries, tidal James, and South Fork Shenandoah.",
-		"lakes": {
-			"Buggs Island": {
-				"gnis_id": null
-			},
-			"Chesdin": {
-				"gnis_id": 1474230,
-				"latitude": 37.2775822,
-				"longitude": -77.6623003
-			},
-			"Chickahominy": {
-				"gnis_id": 1478078,
-				"latitude": 37.4037577,
-				"longitude": -76.956077
-			},
-			"Cohoon": {
-				"gnis_id": 1502117,
-				"latitude": 36.7572092,
-				"longitude": -76.645278
-			},
-			"Anna": {
-				"gnis_id": 1501942,
-				"latitude": 38.0611819,
-				"longitude": -77.8344649
-			},
-			"Smith Mountain": {
-				"gnis_id": 1502131,
-				"latitude": 37.062907,
-				"longitude": -79.7660301
-			},
-			"Prince": {
-				"gnis_id": 1502102,
-				"latitude": 36.806427,
-				"longitude": -76.6466867
-			},
-			"Gaston": {
-				"gnis_id": 985605,
-				"latitude": 36.5358582,
-				"longitude": -78.0552001
-			},
-			"Claytor": {
-				"gnis_id": 1501983,
-				"latitude": 37.0373452,
-				"longitude": -80.6593262
-			},
-			"Brittle": {
-				"gnis_id": 1501961,
-				"latitude": 38.751701,
-				"longitude": -77.6943356
-			},
-			"Moomaw": {
-				"gnis_id": 1502172,
-				"latitude": 37.9515137,
-				"longitude": -79.9553351
-			},
-			"Orange": {
-				"gnis_id": 1471939,
-				"latitude": 38.2261655,
-				"longitude": -78.0189351
-			},
-			"Burke": {
-				"gnis_id": 1464110,
-				"latitude": 38.7626447,
-				"longitude": -77.2992494
-			},
-			"South Holston": {
-				"gnis_id": 1327073,
-				"latitude": 36.5585741,
-				"longitude": -82.0043899
-			},
-			"Western Branch": {
-				"gnis_id": 1479861,
-				"latitude": 36.8060143,
-				"longitude": -76.6182993
-			}
-		},
-		"rivers": {
-			"tidal Chickahominy": {
-				"gnis_id": 1478374,
-				"latitude": 37.2334815,
-				"longitude": -76.8896853
-			},
-			"its tributaries": {
-				"gnis_id": null
-			},
-			"tidal James": {
-				"gnis_id": 1488853,
-				"latitude": 36.9415369,
-				"longitude": -76.4435588
-			},
-			"South Fork Shenandoah": {
-				"gnis_id": 1487411,
-				"latitude": 38.9442772,
-				"longitude": -78.1875001
-			}
-		}
-	},
-	"fishing_techniques": "Light spinning or spincasting rods and reels with tiny jigs, doll flies, streamers, small crank baits that imitate minnows, small spoons and spinner-bucktail combinations, and spinner-grubs. Best live baits are small to medium minnows."
-}
-]
diff --git a/fishing/species/largemouth_bass.json b/fishing/species/largemouth_bass.json
deleted file mode 100644
index 3e3983b..0000000
--- a/fishing/species/largemouth_bass.json
+++ /dev/null
@@ -1,88 +0,0 @@
-[
-{
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
-	"state": "Virginia",
-	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
-	"schema": "",
-	"schema_version": "1.0a",
-	"documentation": "",
-	"species": {
-		"name": "Largemouth Bass",
-		"taxonomy": "Micropterus salmoides",
-		"bova_id": 10188,
-		"images": [],
-		"aliases": [
-			"Black bass",
-			"bigmouth"
-		],
-		"identification": "Sunfish family. Basically dark greenish above fading to a whitish belly, but variable depending on the water it lives in. Shows a series of dark blotches that form a dark horizontal band along its midline to its tail. Named because of its big mouth. Upper jaw extends well beyond the eye. Dorsal fin deeply notched. Average weight is 2 to 4 lbs., with up to 10 lbs. occurring in some waters."
-	},
-	"limits": {},
-	"best_fishing": {
-		"description": "Lakes: Anna, Gaston, Buggs Island, Chickahominy, Chesdin, Smith Mountain, Prince, Briery Creek, Western Branch and Flannagan. Rivers: Chickahominy (below Walkers Dam) and James (below the fall line).",
-		"lakes": {
-			"Anna": {
-				"gnis_id": 1501942,
-				"latitude": 38.0611819,
-				"longitude": -77.8344649
-			},
-			"Gaston": {
-				"gnis_id": 985605,
-				"latitude": 36.5358582,
-				"longitude": -78.0552001
-			},
-			"Buggs Island": {
-				"gnis_id": null
-			},
-			"Chickahominy": {
-				"gnis_id": 1478078,
-				"latitude": 37.4037577,
-				"longitude": -76.956077
-			},
-			"Chesdin": {
-				"gnis_id": 1474230,
-				"latitude": 37.2775822,
-				"longitude": -77.6623003
-			},
-			"Smith Mountain": {
-				"gnis_id": 1502131,
-				"latitude": 37.062907,
-				"longitude": -79.7660301
-			},
-			"Prince": {
-				"gnis_id": 1502102,
-				"latitude": 36.806427,
-				"longitude": -76.6466867
-			},
-			"Briery Creek": {
-				"gnis_id": null
-			},
-			"Western Branch": {
-				"gnis_id": 1479861,
-				"latitude": 36.8060143,
-				"longitude": -76.6182993
-			},
-			"Flannagan": {
-				"gnis_id": 1484463,
-				"latitude": 37.1767904,
-				"longitude": -82.3933472
-			}
-		},
-		"rivers": {
-			"Chickahominy (below Walkers Dam)": {
-				"gnis_id": 1478374,
-				"latitude": 37.2334815,
-				"longitude": -76.8896853
-			},
-			"James (below the fall line)": {
-				"gnis_id": 1488853,
-				"latitude": 36.9415369,
-				"longitude": -76.4435588
-			}
-		}
-	},
-	"fishing_techniques": "Fly, medium spincasting, spinning or baitcasting rods and reels can all be used. Plastic worms and other plastic imitations, crankbaits, spinner baits, surface lures, jigs and other lures imitating minnows, crayfish, frogs, salamanders and nightcrawlers.\\nFor flyrodders, streamer flies, bucktails and large poppers. Live bait includes small bluegills, minnows of many kinds, crayfish, nightcrawlers, frogs, etc."
-}
-]
diff --git a/fishing/species/white_crappie.json b/fishing/species/white_crappie.json
deleted file mode 100644
index 757bce0..0000000
--- a/fishing/species/white_crappie.json
+++ /dev/null
@@ -1,125 +0,0 @@
-[
-{
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
-	"state": "Virginia",
-	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
-	"schema": "",
-	"schema_version": "1.0a",
-	"documentation": "",
-	"species": {
-		"name": "White Crappie",
-		"taxonomy": "Pomoxis annularis",
-		"bova_id": 10189,
-		"images": [],
-		"aliases": [
-			"papermouth",
-			"Calico bass",
-			"specks",
-			"speckled perch"
-		],
-		"identification": "Sunfish family. The white crappie has six spines - rarely five - and it has noticeable vertical bars on its silvery sides as well as a light pearlescent color or iridescent blue and lavendar.\\nBoth white and black crappie have protruding lower jaws."
-	},
-	"limits": {},
-	"best_fishing": {
-		"description": "Lakes: Buggs Island, Chesdin, Chickahominy, Cohoon, Anna, Smith Mountain, Prince, Gaston, Claytor, Brittle, Moomaw, Orange, Burke, South Holston, and Western Branch. Rivers: tidal Chickahominy and its tributaries, tidal James, and South Fork Shenandoah.",
-		"lakes": {
-			"Buggs Island": {
-				"gnis_id": null
-			},
-			"Chesdin": {
-				"gnis_id": 1474230,
-				"latitude": 37.2775822,
-				"longitude": -77.6623003
-			},
-			"Chickahominy": {
-				"gnis_id": 1478078,
-				"latitude": 37.4037577,
-				"longitude": -76.956077
-			},
-			"Cohoon": {
-				"gnis_id": 1502117,
-				"latitude": 36.7572092,
-				"longitude": -76.645278
-			},
-			"Anna": {
-				"gnis_id": 1501942,
-				"latitude": 38.0611819,
-				"longitude": -77.8344649
-			},
-			"Smith Mountain": {
-				"gnis_id": 1502131,
-				"latitude": 37.062907,
-				"longitude": -79.7660301
-			},
-			"Prince": {
-				"gnis_id": 1502102,
-				"latitude": 36.806427,
-				"longitude": -76.6466867
-			},
-			"Gaston": {
-				"gnis_id": 985605,
-				"latitude": 36.5358582,
-				"longitude": -78.0552001
-			},
-			"Claytor": {
-				"gnis_id": 1501983,
-				"latitude": 37.0373452,
-				"longitude": -80.6593262
-			},
-			"Brittle": {
-				"gnis_id": 1501961,
-				"latitude": 38.751701,
-				"longitude": -77.6943356
-			},
-			"Moomaw": {
-				"gnis_id": 1502172,
-				"latitude": 37.9515137,
-				"longitude": -79.9553351
-			},
-			"Orange": {
-				"gnis_id": 1471939,
-				"latitude": 38.2261655,
-				"longitude": -78.0189351
-			},
-			"Burke": {
-				"gnis_id": 1464110,
-				"latitude": 38.7626447,
-				"longitude": -77.2992494
-			},
-			"South Holston": {
-				"gnis_id": 1327073,
-				"latitude": 36.5585741,
-				"longitude": -82.0043899
-			},
-			"Western Branch": {
-				"gnis_id": 1479861,
-				"latitude": 36.8060143,
-				"longitude": -76.6182993
-			}
-		},
-		"rivers": {
-			"tidal Chickahominy": {
-				"gnis_id": 1478374,
-				"latitude": 37.2334815,
-				"longitude": -76.8896853
-			},
-			"its tributaries": {
-				"gnis_id": null
-			},
-			"tidal James": {
-				"gnis_id": 1488853,
-				"latitude": 36.9415369,
-				"longitude": -76.4435588
-			},
-			"South Fork Shenandoah": {
-				"gnis_id": 1487411,
-				"latitude": 38.9442772,
-				"longitude": -78.1875001
-			}
-		}
-	},
-	"fishing_techniques": "Light spinning or spincasting rods and reels with tiny jigs, doll flies, streamers, small crank baits that imitate minnows, small spoons and spinner-bucktail combinations, and spinner-grubs. Best live baits are small to medium minnows."
-}
-]
diff --git a/fishing/species/spotted_bass.json b/fishing/spotted_bass.json
similarity index 77%
rename from fishing/species/spotted_bass.json
rename to fishing/spotted_bass.json
index dda27b9..6095547 100644
--- a/fishing/species/spotted_bass.json
+++ b/fishing/spotted_bass.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"Kentucky bass",
 			"spot"
 		],
-		"identification": "Sunfish family. Much like the largemouth and the smallmouth, it is called the “in-between” species. It is distinguished from the smallmouth by the dark, blotchy lateral band from head to tail. The back of spotted bass' upper jaw lines up with the middle rear of the eye, while largemouth jaws extends past the eye. It derives its name from the black spots on its belly scales. Most are about a 1 lb. or less."
+		"identification": "Sunfish family. Much like the largemouth and the smallmouth, it is called the “in-between” species. It is distinguished from the smallmouth by the dark, blotchy lateral band from head to tail. The back of spotted bass’ upper jaw lines up with the middle rear of the eye, while largemouth jaws extends past the eye. It derives its name from the black spots on its belly scales. Most are about a 1 lb. or less."
 	},
 	"limits": {},
 	"best_fishing": {
diff --git a/fishing/species/striped_bass.json b/fishing/striped_bass.json
similarity index 82%
rename from fishing/species/striped_bass.json
rename to fishing/striped_bass.json
index 5dcf89d..54cfa7b 100644
--- a/fishing/species/striped_bass.json
+++ b/fishing/striped_bass.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"striper",
 			"rockfish"
 		],
-		"identification": "Striped Bass family. True bass family. Streamlined, elongate body; coloration shades from dark olive above through silvery sides to a white belly; 7 to 8 prominent unbroken black stripes originate behind the head and extend to the tail; more prominent than on the white bass.\\nTwo spines on the gill cover; two patches of teeth on tongue. Ten to 15 lb. fish are common with 30 to 40 lb. + fish landed each season."
+		"identification": "Striped Bass family. True bass family. Streamlined, elongate body; coloration shades from dark olive above through silvery sides to a white belly; 7 to 8 prominent unbroken black stripes originate behind the head and extend to the tail; more prominent than on the white bass. Two spines on the gill cover; two patches of teeth on tongue. Ten to 15 lb. fish are common with 30 to 40 lb.+ fish landed each season."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -67,9 +66,6 @@
 				"gnis_id": 1473295,
 				"latitude": 36.8804197,
 				"longitude": -78.6958369
-			},
-			"all tidal rivers": {
-				"gnis_id": null
 			}
 		}
 	},
diff --git a/fishing/species/walleye.json b/fishing/walleye.json
similarity index 73%
rename from fishing/species/walleye.json
rename to fishing/walleye.json
index 6fb4a2c..e6745dd 100644
--- a/fishing/species/walleye.json
+++ b/fishing/walleye.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"walleyed pike",
 			"jack"
 		],
-		"identification": "Perch family. Largest member of the perch family (Percidae).\\nGrows up to 21 inches, 3 and 4 lbs. by age three. Brassy-olive sides flecked with green and gold, and mottled by 6 to 8 obscure marking on top, white belly. Dorsal fins completely separate and unmarked, except for a distinct dark blotch at the rear base of the front dorsal fin. White blotch on tip of lower tail fin. The eye has a milky cornea, hence the name walleye."
+		"identification": "Perch family. Largest member of the perch family (Percidae). Grows up to 21 inches, 3 and 4 lbs. by age three. Brassy-olive sides flecked with green and gold, and mottled by 6 to 8 obscure marking on top, white belly. Dorsal fins completely separate and unmarked, except for a distinct dark blotch at the rear base of the front dorsal fin. White blotch on tip of lower tail fin. The eye has a milky cornea, hence the name walleye."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -33,10 +32,11 @@
 				"latitude": 36.5585741,
 				"longitude": -82.0043899
 			},
-			"Gaston (especially below Kerr Dam)": {
+			"Gaston": {
 				"gnis_id": 985605,
 				"latitude": 36.5358582,
-				"longitude": -78.0552001
+				"longitude": -78.0552001,
+				"comment": "especially below Kerr Dam"
 			},
 			"Leesville": {
 				"gnis_id": 1469281,
@@ -85,6 +85,16 @@
 			}
 		},
 		"rivers": {
+			"Clinch": {
+				"gnis_id": 1307258,
+				"latitude": 35.8634079,
+				"longitude": -84.5318786
+			},
+			"Dan": {
+				"gnis_id": 1465581,
+				"latitude": 36.6559735,
+				"longitude": -78.5986127
+			},
 			"New": {
 				"gnis_id": 1552301,
 				"latitude": 38.1617741,
@@ -102,19 +112,9 @@
 			},
 			"South Holston": {
 				"gnis_id": null
-			},
-			"Clinch": {
-				"gnis_id": 1307258,
-				"latitude": 35.8634079,
-				"longitude": -84.5318786
-			},
-			"Dan": {
-				"gnis_id": 1465581,
-				"latitude": 36.6559735,
-				"longitude": -78.5986127
 			}
 		}
 	},
-	"fishing_techniques": "Jigs dressed with plastic grubs or tipped with live bait work well, especially in cold water. Three to five-inch minnow plugs are very effective when walleyes move into shallow water.\\nCrankbaits and jigging spoons work well when walleyes are deep. Trolling with nightcrawler harnesses (spinner rigs) is the preferred method in reservoirs during the summer months. Live baits such as minnows, shad or nightcrawlers are always a good option for walleye."
+	"fishing_techniques": "Jigs dressed with plastic grubs or tipped with live bait work well, especially in cold water. Three to five-inch minnow plugs are very effective when walleyes move into shallow water. Crankbaits and jigging spoons work well when walleyes are deep. Trolling with nightcrawler harnesses (spinner rigs) is the preferred method in reservoirs during the summer months. Live baits such as minnows, shad or nightcrawlers are always a good option for walleye."
 }
 ]
diff --git a/fishing/species/warmouth.json b/fishing/warmouth.json
similarity index 57%
rename from fishing/species/warmouth.json
rename to fishing/warmouth.json
index 30dd936..d72d64c 100644
--- a/fishing/species/warmouth.json
+++ b/fishing/warmouth.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -23,9 +22,34 @@
 	"limits": {},
 	"best_fishing": {
 		"description": "Numerous small lakes, ponds such as lakes Orange, Lee Hall, and Airfield; and slow-moving, swampy rivers and streams, such as Dragon Run and Nottoway River.",
-		"lakes": {},
-		"rivers": {}
+		"lakes": {
+			"Airfield": {
+				"gnis_id": 1501938,
+				"latitude": 36.9077671,
+				"longitude": -77.033419
+			},
+			"Lee Hall": {
+				"gnis_id": null
+			},
+			"Orange": {
+				"gnis_id": 1471939,
+				"latitude": 38.2261655,
+				"longitude": -78.0189351
+			}
+		},
+		"rivers": {
+			"Dragon Run": {
+				"gnis_id": 1465940,
+				"latitude": 37.7979172,
+				"longitude": -76.8419076
+			},
+			"Nottoway": {
+				"gnis_id": 1471681,
+				"latitude": 36.5437634,
+				"longitude": -76.9160718
+			}
+		}
 	},
-	"fishing_techniques": "Caught incidental to other fishing activities.\\nWill take a variety of small artificials, as well as worms, and small crayfish and minnows."
+	"fishing_techniques": "Caught incidental to other fishing activities. Will take a variety of small artificials, as well as worms, and small crayfish and minnows."
 }
 ]
diff --git a/fishing/species/white_bass.json b/fishing/white_bass.json
similarity index 86%
rename from fishing/species/white_bass.json
rename to fishing/white_bass.json
index fa540fa..aea42f9 100644
--- a/fishing/species/white_bass.json
+++ b/fishing/white_bass.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -17,7 +16,7 @@
 			"Silver bass",
 			"linesides"
 		],
-		"identification": "Striped Bass family. Temperate “true” bass family. Light greenish back, light yellowish-green to silver sides to a silvery-white below, 6 to 8 horizontal faint stripes; stripes below later line are broken; the first stripe below the lateral line is not complete to tail. Deep-bodied with distinctively arched back, considerably smaller than its striped bass cousin. Single spine on gill cover; variable patch of teeth on tongue.\\nCommonly reaches 1/2 to 2 lbs."
+		"identification": "Striped Bass family. Temperate “true” bass family. Light greenish back, light yellowish-green to silver sides to a silvery-white below, 6 to 8 horizontal faint stripes; stripes below later line are broken; the first stripe below the lateral line is not complete to tail. Deep-bodied with distinctively arched back, considerably smaller than its striped bass cousin. Single spine on gill cover; variable patch of teeth on tongue. Commonly reaches 1/2 to 2 lbs."
 	},
 	"limits": {},
 	"best_fishing": {
@@ -48,6 +47,11 @@
 			}
 		},
 		"rivers": {
+			"Dan": {
+				"gnis_id": 1465581,
+				"latitude": 36.6559735,
+				"longitude": -78.5986127
+			},
 			"New": {
 				"gnis_id": 1552301,
 				"latitude": 38.1617741,
@@ -56,15 +60,11 @@
 			"South Holston": {
 				"gnis_id": null
 			},
-			"the Dan": {
-				"gnis_id": 1465581,
-				"latitude": 36.6559735,
-				"longitude": -78.5986127
-			},
-			"Staunton (during spawning)": {
+			"Staunton": {
 				"gnis_id": 1475098,
 				"latitude": 38.4437377,
-				"longitude": -78.3691724
+				"longitude": -78.3691724,
+				"comment": "during spawning"
 			}
 		}
 	},
diff --git a/fishing/species/white_catfish.json b/fishing/white_catfish.json
similarity index 61%
rename from fishing/species/white_catfish.json
rename to fishing/white_catfish.json
index 13bb09c..6ca6133 100644
--- a/fishing/species/white_catfish.json
+++ b/fishing/white_catfish.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -22,8 +21,29 @@
 	"best_fishing": {
 		"description": "Tidal rivers such as the Potomac, Rappahannock, James, and York and numerous lakes in southeast and central Virginia.",
 		"lakes": {},
-		"rivers": {}
+		"rivers": {
+			"James": {
+				"gnis_id": 1488853,
+				"latitude": 36.9415369,
+				"longitude": -76.4435588
+			},
+			"Potomac": {
+				"gnis_id": 1472708,
+				"latitude": 38.3473481,
+				"longitude": -77.2863695
+			},
+			"Rappahannock": {
+				"gnis_id": 1479404,
+				"latitude": 37.5876333,
+				"longitude": -76.2891091
+			},
+			"York": {
+				"gnis_id": 1479591,
+				"latitude": 37.2476419,
+				"longitude": -76.3824455
+			}
+		}
 	},
-	"fishing_techniques": "Many of the same methods used for other catfish.\\nWorms, minnows, scented baits, fished on or near the bottom."
+	"fishing_techniques": "Many of the same methods used for other catfish. Worms, minnows, scented baits, fished on or near the bottom."
 }
 ]
diff --git a/fishing/white_crappie.json b/fishing/white_crappie.json
index e603159..4ac1b83 100644
--- a/fishing/white_crappie.json
+++ b/fishing/white_crappie.json
@@ -2,8 +2,8 @@
 {
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -34,10 +34,10 @@
 			"1": {
 				"places": {
 					"Flannagan Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					},
 					"South Holston Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					}
 				},
 				"creel": {
@@ -52,13 +52,13 @@
 			"2": {
 				"places": {
 					"Gaston Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					},
 					"Buggs Island Reservoir": {
-						"gnis_id": TK
+						"gnis_id": null
 					},
 					"New River": {
-						"gnis_id": TK,
+						"gnis_id": null,
 						"restriction": "From the VA–NC state line downstream to the confluence of the New and Little rivers in Grayson County"
 					}
 				}
@@ -66,61 +66,96 @@
 		}
 	},
 	"best_fishing": {
+		"description": "Lakes: Buggs Island, Chesdin, Chickahominy, Cohoon, Anna, Smith Mountain, Prince, Gaston, Claytor, Brittle, Moomaw, Orange, Burke, South Holston, and Western Branch. Rivers: tidal Chickahominy and its tributaries, tidal James, and South Fork Shenandoah.",
 		"lakes": {
 			"Buggs Island": {},
 			"Chesdin": {
-				"gnis_id": 1474230
+				"gnis_id": 1474230,
+				"latitude": 37.2775822,
+				"longitude": -77.6623003
 			},
 			"Chickahominy": {
-				"gnis_id": 1478078
+				"gnis_id": 1478078,
+				"latitude": 37.4037577,
+				"longitude": -76.956077
 			},
 			"Cohoon": {
-				"gnis_id": 1501680
+				"gnis_id": 1502117,
+				"latitude": 36.7572092,
+				"longitude": -76.645278
 			},
 			"Anna": {
-				"gnis_id": 1501942
+				"gnis_id": 1501942,
+				"latitude": 38.0611819,
+				"longitude": -77.8344649
 			},
 			"Smith Mountain": {
-				"gnis_id": 1502131
+				"gnis_id": 1502131,
+				"latitude": 37.062907,
+				"longitude": -79.7660301
 			},
 			"Prince": {
-				"gnis_id": 1502102
+				"gnis_id": 1502102,
+				"latitude": 36.806427,
+				"longitude": -76.6466867
 			},
 			"Gaston": {
-				"gnis_id": 985605
+				"gnis_id": 985605,
+				"latitude": 36.5358582,
+				"longitude": -78.0552001
 			},
 			"Claytor": {
-				"gnis_id": 1501983
+				"gnis_id": 1501983,
+				"latitude": 37.0373452,
+				"longitude": -80.6593262
 			},
 			"Brittle": {
-				"gnis_id": 1501961
+				"gnis_id": 1501961,
+				"latitude": 38.751701,
+				"longitude": -77.6943356
 			},
 			"Moomaw": {
-				"gnis_id": 1502172
+				"gnis_id": 1502172,
+				"latitude": 37.9515137,
+				"longitude": -79.9553351
 			},
 			"Orange": {
-				"gnis_id": 1471939
+				"gnis_id": 1471939,
+				"latitude": 38.2261655,
+				"longitude": -78.0189351
 			},
 			"Burke": {
-				"gnis_id": 1464110
+				"gnis_id": 1464110,
+				"latitude": 38.7626447,
+				"longitude": -77.2992494
 			},
 			"South Holston": {
-				"gnis_id": 1327073
+				"gnis_id": 1327073,
+				"latitude": 36.5585741,
+				"longitude": -82.0043899
 			},
 			"Western Branch": {
-				"gnis_id": 1479861
+				"gnis_id": 1479861,
+				"latitude": 36.8060143,
+				"longitude": -76.6182993
 			}
 		},
 		"rivers": {
-			"Tidal Chickahominy": {
+			"tidal Chickahominy": {
 				"gnis_id": 1478374,
+				"latitude": 37.2334815,
+				"longitude": -76.8896853,
 				"comment": "and its tributaries"
 			},
-			"Tidal James": {
-				"gnis_id": 1488853
+			"tidal James": {
+				"gnis_id": 1488853,
+				"latitude": 36.9415369,
+				"longitude": -76.4435588
 			},
 			"South Fork Shenandoah": {
-				"gnis_id": 1487411
+				"gnis_id": 1487411,
+				"latitude": 38.9442772,
+				"longitude": -78.1875001
 			}
 		}
 	},
diff --git a/fishing/species/white_perch.json b/fishing/white_perch.json
similarity index 90%
rename from fishing/species/white_perch.json
rename to fishing/white_perch.json
index 3dfa890..840249a 100644
--- a/fishing/species/white_perch.json
+++ b/fishing/white_perch.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",
@@ -71,8 +70,10 @@
 			}
 		},
 		"rivers": {
-			"Tidal rivers (Pamunkey": {
-				"gnis_id": null
+			"Pamunkey": {
+				"gnis_id": 1472037,				
+				"latitude": 37.5176448,
+				"longitude": -76.791628
 			},
 			"James": {
 				"gnis_id": 1488853,
@@ -104,13 +105,10 @@
 				"latitude": 36.512098,
 				"longitude": -76.0746523
 			},
-			"Potomac)": {
+			"Potomac": {
 				"gnis_id": 1472708,
 				"latitude": 38.3473481,
 				"longitude": -77.2863695
-			},
-			"most of their tributary creeks": {
-				"gnis_id": null
 			}
 		}
 	},
diff --git a/fishing/species/yellow_perch.json b/fishing/yellow_perch.json
similarity index 93%
rename from fishing/species/yellow_perch.json
rename to fishing/yellow_perch.json
index f346bfe..9d3ad60 100644
--- a/fishing/species/yellow_perch.json
+++ b/fishing/yellow_perch.json
@@ -1,10 +1,9 @@
 [
 {
-	"_comment": "This file was generated by a script and has not been reviewed for accuracy. Please remove this comment after reviewing.",
 	"state": "Virginia",
 	"agency": "Department of Game and Inland Fisheries",
-	"date_effective": "2013-07-01",
-	"date_expires": "2014-06-30",
+	"date_effective": "2014-07-01",
+	"date_expires": "2015-06-30",
 	"schema": "",
 	"schema_version": "1.0a",
 	"documentation": "",