more final fixes