General fixes , Needs to fix undefined token in player history