better trip
price getters
Merge branch 'dbparser'