updated headers, comments