fix few incoherences, but still don't work