Validation fixes and input improvements