Minor changes

merging minor changes into master.