Couple of corrections on headers. Tests carried out.