Improve teambox-homework