Added Header and Misc Fixes