Content and minor header fix