fixes, fixes, and team_dashboard integration !