updated validation
completed basic validations