Typos and Header fixes