player and user associations refactored, teams added