port forwarding improvements

@niwo 

cc @sontags 

please sign off