edited player and location classes