some more final changes