Tried to fix most of the headers, fixed a few

minor problems.