merge minor changes.