Hello looking for help

When my car is warm I have a very strange surging feeling when the car is stationary. I have looked around on Google and it appears to be quite common with a lot of people suggesting cleaning out the MAF with electrical cleaner and the ICV with throttle body cleaner. I have had a look under the bonnet and just want to some clarification if I have located the correct parts as I don't think I have.

[IMG]http://img24.imageshack.us/img24/4198/imag0050dm.jpg[/IMG]
Shot at 2011-10-27

[IMG]http://img26.imageshack.us/img26/826/imag0049qs.jpg[/IMG]
Shot at 2011-10-27

Thanks