fixed up some validations