added some more headers, etc