correction bugs, ajout defines