I think also they should be raising awareness of both the cost and the ineffectivness of mass surveillance. It has failed specatularly to stop some of the worse attacks, because all the resources where tied up playing video games on thier databases, instead of old fashioned boots on the ground monitoring of suspects that on the large where already known to them. The sheer cost of building the interception infrastructure is on a nightmare scale, maybe people would care more if they knew how much it costs them personaly.