Improve transport logic. Closes #94 and fixes #151.