added get_team and corrected get_player so as to not get into an infinite loop
merge
moved finished edi