validations

validations and edits were fixed