diff --git a/pis/gw.yaml b/pis/gw.yaml
index 00c2da4..6789014 100644
--- a/pis/gw.yaml
+++ b/pis/gw.yaml
@@ -23,6 +23,8 @@ pis:
     stops: [hot,shi,wgv,twy,rdg]
   - code: "0191"
     stops: [pad,slo,mai,twy,rdg]
+  - code: "0199"
+    stops: []
   - code: "0202"
     stops: [rdg,twy,mai,slo,lny,wdt,hay,eal,pad]
   - code: "0218"
@@ -257,6 +259,8 @@ pis:
     stops: [gld,ash,ncm,fnn,baw,snd,crn,wkm,rdg]
   - code: "1596"
     stops: [rdg,wkm,crn,snd,baw,fnn,ncm,ash,gld,sfr,chl,gom,dkt,dpd,bto,rei,rdh]
+  - code: "1598"
+    stops: [gtw,rdh,rei,dpd,sfr,gld,wan,ash,ncm,fnn,baw,snd,crn,wkm,rdg]
   - code: "1609"
     stops: [rdh,rei,bto,dpd,dkt,gom,chl,sfr,gld,ash,ncm,fnn,baw,snd,crn,wkm,wns,rdg]
   - code: "1611"
@@ -295,6 +299,12 @@ pis:
     stops: [swi,bpw,nwp,cdf]
   - code: "1657"
     stops: [bpw,nwp,cdf]
+  - code: "1659"
+    stops: []
+  - code: "1660"
+    stops: [cdf,nwp]
+  - code: "1670"
+    stops: []
   - code: "1674"
     stops: [nby,bdw]
   - code: "1680"
@@ -349,6 +359,8 @@ pis:
     stops: [wos,psh,eve,hyb,mim,kgm,sip,auw,cby,fin,cme,hnd,oxf,rad,cum,did]
   - code: "1710"
     stops: [gmv,mvl,wof,wos,wop,psh,eve]
+  - code: "1711"
+    stops: []
   - code: "1712"
     stops: [rdg,wkm,baw,ncm,gld,sfr,dkt,dpd,bto,rei,rdh,gtw]
   - code: "1713"
@@ -2651,6 +2663,8 @@ pis:
     stops: [exm,lym,lyc,exn,top,nco,dig,pol,sjp,exc,exd,ext,mbt,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: "6193"
     stops: [cdf,nwp,stj,pwy,fit,bri,bth,boa,tro,wsb,dmh,wmn,sal,rom,sou,frm,csa,ftn,pms,pmh]
+  - code: "6196"
+    stops: []
   - code: "6205"
     stops: [exd,ext,mbt,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: "6207"
@@ -2713,6 +2727,8 @@ pis:
     stops: [exm,lym,top,nco,dig,pol,exc,exd,ext,mbt,scs,dww,dwl,tgm,nta,trr,tqy,pgn]
   - code: "6245"
     stops: [pgn,tqy,trr,nta,tgm,dwl,dww,mbt,exd,exc,sjp,pol,dig,nco,top,exn,lyc,lym,exm]
+  - code: "6249"
+    stops: [exd,exc,dig,nco,top,lyc,lym,exm]
   - code: "6250"
     stops: [bri,kyn,olf,bth,ffd,avf,boa,tro,wsb,dmh,wmn]
   - code: "6253"
@@ -2815,19 +2831,3 @@ pis:
     stops: [hwv,hxx,pad]
   - code: "9812"
     stops: [hwv,hxx]
-  - code: "6196"
-    stops: []
-  - code: "1660"
-    stops: [cdf,nwp]
-  - code: "1659"
-    stops: []
-  - code: "1598"
-    stops: [gtw,rdh,rei,dpd,sfr,gld,wan,ash,ncm,fnn,baw,snd,crn,wkm,rdg]
-  - code: "1670"
-    stops: []
-  - code: "6249"
-    stops: [exd,exc,dig,nco,top,lyc,lym,exm]
-  - code: "1711"
-    stops: []
-  - code: "0199"
-    stops: []