Ntp fixes

This incorporates #18