yea, rattle is a chain. tapping is a lifter.
don't know what you use but stick some mobil 1 15/50
in there and see what happens. might take a second change to
get rid of it completly if its a tappet noise. good stuff.
works on my customers.
if its a rattle then do chain and tensioner and look closely at the
guides.

george