added some tracing, inverted origin/destination
added more tracing