Validation and bug fixes
Validation updates