Player comments, refactoring and minor imporovements