upstream changes and first small cut at radiotap parsing