changes as per Erick's mail.

Changes done as per Erick's mail. Few things are remaining.