fixing major bodies returned data and correctness