Singleton implementation for the player & small fixes