various bug solved by Mehdi-Pierre
