Round up of fixes

Thanks to ithr0n for his keen eye on spotting the mistakes inbetween the
conversion of players & their names being displayed.