Hogan's Heroes MBTI

Now, admittedly a lot of this is conjecture, and a few choices are based on fan portrayals of these characters.  I'll briefly explain each choice:

Analyst temperaments
ENTJ - Colonel Robert E. Hogan, United States Army Air Force.  Hogan has developed his extroverted thinking (Te) and introverted intuition (Ni) to almost equal levels, but still displays extroverted tendencies, such as having to be in on everything going on at the camp, and ignoring people's personal bubbles.
ENTP - Tech Sgt. Andrew J. Carter, USAAF.  Carter demonstrates an almost excessive use of extroverted intuition (Ne), constantly coming up with crazy, highly imaginative ideas, and getting too distracted to carry most of them out.  His expertise with explosives demonstrates a developed introverted thinking (Ti).
INTJ - General Albert Hans Burkhalter, German Luftwaffe.  This one is based on conjecture.  Burkhalter demonstrates Te with introverted tendencies.  I don't believe he uses introverted sensing (Si), as he shows no interest in reminiscing the past or in pattern recognition.  So he probably uses Ni instead, which is a very difficult function to see in action.
INTP - Major Wolfgang Hochstetter, Gestapo.  Hochstetter is actually very similar to Carter, using Ne and Ti.  He demonstrates Ti more often than Ne, making him an introvert.  He has a highly imaginative and obsessive personality, which is a result of Ne taking the auxiliary position in the function stack.

Sentinel temperaments
ESTJ - Marie Louise "Tiger" Manet, French Resistance.  This one is conjecture and is open to interpretation.  But Tiger seems to demonstrate Te as her dominant function, making her a match for Hogan in terms of ability to take control of a situation.  She is good with pattern recognition, a function of Si.  Being French, she's a bit unusual in that she is a Sentinel rather than an Explorer.
ESFJ - Master Sgt. Hans Schultz, Luftwaffe.  Schultz is a typical Caregiver type, using extroverted feeling (Fe) as his dominant function.  He is very compassionate and empathetic.  He enjoys reminiscing, and has almost no gut instinct, making it clear that he uses Si as his auxiliary.
ISTJ - Colonel Wilhelm Klink, Luftwaffe.  Klink's dominant Si is very highly developed, almost to the detriment of his other functions.  To put it in Hogan's words, "Klink and his monocle are still fighting WWI."  However, Hogan is able to invoke Klink's very underdeveloped Ne, keeping him confused so that he can't use his natural Si abilities to spot patterns around the camp.  Klink does use Te, but it often takes a back seat to his introverted feeling (Fi), causing him to get stuck in a dom/tert loop.  This results in his avoidant personality.  When Si and Te are functioning as they should, Klink is a very efficient administrator.
ISFJ - Hilda, Klink's secretary and Allied sympathizer.  ISFJs are commonly found in bookkeeping due to their dominant Si.  Hilda is also sympathetic toward the Allies, and seems to demonstrate the use of Fe.  This one is up to personal interpretation.

Explorer temperaments
ESTP - Marya, White Russian Allied spy.  I had originally labeled Marya as an ENTJ due to her ability to run rings around even Hogan.  But the ESTP is just as capable as the ENTJ in doing this, and Marya's most developed function is clearly extroverted sensing (Se).  She is able to quickly analyze a situation using Ti, and can emotionally manipulate those around her using Fe.  She is also fickle, as the ESTP tends to be.
ESFP - Corporal Louis LeBeau, French Air Force.  After some online discussion, I've changed my initial typing of LeBeau.  It would appear he does indeed use Se more often than Fi, though both are highly developed in him.  Se is a very alert, sensory function, which is commonly found in the top two slots of French function stacks.  LeBeau is also highly patriotic, priding himself on his identity as a Frenchman, which demonstrates his use of Fi.  The combination of these functions lead to artistic talent, which LeBeau demonstrates with his cooking, singing and acting abilities.
ISTP - Corporal Peter Newkirk, Royal Air Force.  Newkirk is the snarkiest member of the group, using a dry wit indicative of Ti.  He is also a very sensory person, with his Se especially kicking in whenever girls are mentioned.  As a fairly typical ISTP, Newkirk doesn't have any respect for rank or office.  An individual must earn his respect, but when his respect is earned, Newkirk demonstrates a fierce loyalty and protectiveness toward that person.
ISFP - Marie Bizet, French Resistance.  Marie is one of my favorite one-off characters, and her typing here is based mostly on my own head canon for her.  Though she does seem to demonstrate a use of Fi as her dominant function (one that I have an easy time identifying as an Fi dominant myself).

Diplomat temperaments
ENFJ - Frau Gertrude Linkmeyer, sister of Gen. Burkhalter.  This one is another bit of conjecture.  Diplomat temperaments are difficult to identify due to their rarity in real life and media, and especially in comedy.  Frau Linkmeyer does demonstrate Fe, and seems to be an extrovert.  Though she has not had a chance to demonstrate her auxiliary function, she does not appear to use Si.
ENFP - Group Captain (Colonel) Rodney Crittendon, RAF.  Crittendon is a lover of ideas, has a vivid imagination, and is very easily distracted--which is why he regards Carter as a kindred spirit.  Unlike Carter, Crittendon demonstrates a lack of analytical abilities, but an abundance of patriotism and pride in his self-identity, which is characteristic of Fi.  Crittendon is certainly an advocate of his favored causes, as the ENFP tends to be.
INFJ - Staff Sgt. James Ivan Kinchloe, US Army (Air Force?).  As Hogan's right hand man, Kinch would have to use Ni, acting on the same wavelength as his CO at all time.  Kinch could be an INTJ or INFJ.  He does not demonstrate much use of Si, Fi or Ti, so by process of elimination I concluded he must use Ni.  He seems to empathize with Hogan rather than depend on his own logic, and has the ability to emotionally manipulate others or act as their counselor.  Therefore he appears to use Fe rather than Te.
INFP - Cpl. Karl Langenscheidt, Luftwaffe.  This typing is based entirely on fan portrayals of Langenscheidt.  He is commonly shown to be an idealist, a bit shy, and quite introverted.  There is no character in Hogan's Heroes who is obviously an INFP (unlike MASH, where Father Mulcahy is very typical of that type), and Langenscheidt is the only recurring character on the show who even comes close.

Feel free to discuss.  Perhaps another character would be better suited in a given spot on this chart?  Perhaps a character on the chart has been misplaced?