Doctor Who - The Almost People

I have to say that I was surprised at the ending to this episode.  ***SPOILERS***It should have been painfully obvious, that the doctor and his ganger switched shoes to trick Amy.  And somehow I should have guessed that the eyepatch lady was part of this Flesh business.  But I figured it was a stand alone episode like the two before it and didn't pay it any attention.  Will write more upon second viewing.