Treasures are such a bitch. I was exactly the same, thinking I was thorough, but some are just RIDICULOUS. Like in 2, there are quite a lot you have to shoot down from places.
Don't be sad that you are drawing to the end though! The gloriousness of 2 awaits.