Small addition to main and started forecast commenting