Progress and fixes.