TDR2000:  Fixed and tweaks and the addition of H parsing