Some correction on headers. Tests carried out.