Add njt.json plus some fixes