improve entry validations and specs