Tested the changes.

Few minor other changes.