docs and better transport handling