Check the engine block has the later or was replaced under warrenty if you didn't know! my mate got shafted with one and couldn't sell it for decient money.

Meguiars do an excellant 3 stage cleaning package if you have a weekend to spare! Always found their products to have good results, post some before and after pics!