enhancements to validation