add 10-year equity forcast
some more clean up