some fixes, more to fixe !