Fix up RFC3339 reference
More TODOs