fixed logic issues

lots of broken stuff in the code
* copy pasted field names
* wrong logic when switching back from transit to non transit
* mixed new api with old api classes