adding validations + bugs