Update headers and spelling corrction