Made a few changes still not printing stops.