lots of final fixes.