Added more/prettier validations.