* minor adjustments after merge
* reverting defaultComments to upstream for easier merging (who wants them can get them from my separate export)