updated headers and comments