Yea, I thought it didn't make sense to have both marriage certificate and Advisory on Marriages (Cenomar), as they mean the same thing. But I just had this last minute thought to include it just in case.
As for the NBI, yea it wasn't on the checklist, it was on a completely different site...