However there were a couple things that tweaked me as I was watching, which is surprising to me, because I don't usually let inconsistancies bother me.
It seem very much out of character for Amy to point a gun, in anger at the Doctor. Certainly, her fumbling use of it helped to provide some comic relief, but I thought it was just too much out of character. Actually, as I type this, I remember that I was also surprised that the Doctor started to use a gun. I know he definately has no qualms about providing punishment, in anger, in some form, but guns are so personal and he's repeatedly refused to use them before.
When the marshall was in the ground dying, he said (something like) You're both good men, you just don't realize it. (or "forget sometime"). The marshall had known the doctor for hours(?), a day(?), a week(?). How could he know? That's something that I expect a longtime friend to say, not someone he just met.