Fixed bugs and incoherences