Small changes, validation.