Some headers corrected