Some corrections of my previous commit.