More fixes and updates to validation system