Minor fixes
Team of week (work in progress)