Minor changes.
Improve forecast logic.