Added a script which I will use for validation, some other small changes