Senator Sanders has proposed a bill that would narrow some of the PAT RIOT act surveillance powers.

I can't tell without more information and advice whether this would be sufficient to make that law good, but it looks like a substantial change in the right direction.