Working on tunisie and fixing some typos