a few final comments
Merge branch 'upstream-clean'