minor changes to forwarding thread