more annotation updates and rework the validation utils