consolidate output

also start setting up to put tripsFrom and tripsTo numbers in station
objects in database