Well, there are a lot of companies that do tuning. Rocket Chip, VW Mike L as previously mentioned, Malone tuning, F1 Tuning, and Kerma has a Q-loader and tunes.
And yes, tuning will add the hp torque ect, but milage remains generally the same or better, as long as you can hold off the urge to...