assorted changes

[permalink]