all flags now work in parser.py; added sequence for trip id insertion
fixed merge conflicts