Some Minor make up and validation

Validation not done yet.