validations; some fixes