Began fixing validation errors