Header fixes
Merge pull request #3 from ellaine13/header

A few header fixes