more final fixes.