some more final corrections