Slight changes while fixing player reset bug