Updated for Entry#86 and bug fixes

Bug fix for the player- names were appearing multiple times.