Final refinements and fixes.