Fixed stop-invalidate-on-add issue

It's probably really slow now, but stable.
Ad'tl fix on stop list

Added back in the "arrival < 0" check