Assorted updates pursuant to Wim's comments.