Minor formatting
Fixed processing bug, fixed next position bug.
Increased risk calc log count