update and fix various issues with forwarding