misc enhancements

[merge]