Json2tt improvements

also some ordering fixes in tt files