form validation
merged
fixes in validation