Added a couple stops and verified that all important stops exist