[WRDR-117] Evaluation errors fixed
[WRDR-110] Discrete dividends hundled