Updated headers and comments

Hope I didnt break anything.