Add method in Player + some minor changes and additions