Adds yield curve calculations; other changes