Correcting headers
Applying different comments from dev-zero