Performance and Player class changes

for real this time