additional validation updates and data checks