Modifications to CDS clean price calculation etc