2 Updates and validations

by bltallen