Changed headers and fixed typos