fixing player / refactoring