Progress update:
Polish pass01, still a lot to be done.