Updated simple header matching, cleaned it up, etc.