Cosmetic changes + dreamteam fix