fixed yet more validation errors