more final changes