Flag corrections

I was checking some flags, and I came to the conclussion that some are wrong (or have another version that would be better):
-Spain: Could use the red and yellow one, with a circle having a castle and a Lion on it
-Vatican: They didn't use these keys back then according to wikipedia

I dont know how this can be done, but if anyone have a full list of all flags, and their respective kingdoms on them, I would be grateful to see if they are correct