changind display name to go into a tooltip
fixing race condition
Merge branch 'master' into gh-pages