Player points and other refactorings