Still more progress.
More little tweaks.