Make traffic plotting work again
Merged bla
Merged report