Corrected and completed headers