Fixes header and typos