update Hazard Rates; re-structure discount factor to Markit