fixing all the stuff
adding additional validations