Entered Header and More Fixes