some fixe, and a lot to solve...