Adding some improvements

Merge.