Validation and minor fixes done #244

Closed samudiperera09 closed 7 months ago