fixes & new team management