handling case team complete + several bug fixes