Originator and responder are now added if requested. Also fixed some bugs in the loopback transport.