Header and small general modifications