various changes

[permalink]