fixed bug in display name handling
tidy up last commit.