ntp minor mods and corrections