Validation and other Changes suggested by Prashant.