more validation errors fixed