Check for more headers, and add more debugging flags