added extra valiadators and made validators better