added ntp and TODOs