Header final push; ToDbg tweaks 2