added more stuff to validation