Add forecast.json plus some code fixes