minor changes
Merge and minor changes