Nothing much here.

Submitting changes so that I can resume work elsewhere.