fixed more validation errors