adding some automatisms
fixing headers