First two pictures are not of an F-104, that is a Mig-21. But excellent pictures.
You're right, got hasty in my labeling/pictures, thanks for the catch.