Validation galore
update distribution entries