some changes

Merge minor changes.