fixed some validations