More small tweaks
Merge branch 'master' of https://github.com/lctncld/transport_pollution