more final updates