more work and fixes.