large structural change

format is more usable, can search by stop number