Corrected quite à number of bug :