mostly cleanup; adding extra parameters to transport data