First changes after review, not yet all done. So still WIP.