Lots of progress and fixes.