change to comply with Hagan notation tau_ex for expiry, other minor changes