Extended fix to the 'double talk' issue - I gave all of the relevant text fields unique names so they can be handled correctly by the text delegate.

 I also manually merged several of cclaus' requested changes.