Add tab ref -  Adrien
fix conflict and few typos - adrien