Some more work and fixes.