bunch of changes

team etc