As for the tappets, there isn't alot you can do with them.
What happens is, as the miles pile on, they get clogged up with sh!t from the oil.
Apparently you can strip them down, do a search on clubgti.
Personally i would replace them for new. You will be amazed the difference it will make ?
