Adding PV for CDS and tidying up the various defaults functions