station finder bugfix round 1 DONE