Header commit

More fixins''