Fixes & feature for adding teams

Fixed and new things