team edited

plus other little changes