Modified the futures and options risk report generator. Now fully
working save for discount rate (deal with later)