latest developments with successful header parsing pulled in from master