Updates to header parsing and misc.