Streamlined and improved transport, also fixing a couple of potential bugs.