more client_fwd improvements
license :/