when it rains it pours!
I jacked up the car and got myself underneath again and found ... not one but two candidates for the bolt

The first location is probably the water pump, but I cannot identify the second part. Lacking knowledge I went with my guts feeling and decided for the location one. Am I in luck?
It is claustrophobic under the car!
Location 1 (two pictures, the second one with the bolt inserted)
Location 2: no idea what it is, between engine and tranny.