Forecast implementation + minor fixes