fixed stuff to validate