Fixing and improving the ntp setup