Removed out of date comment
Changed a lot of headers for the better... hopefully