validation fixes and enhancements