Fix validaton
clean up
updated dependencies