more fixes to the name retrieval
Merge pull request #96 from mikeemoo/master

name retrieval fixes