renamed sub_greeks; added a couple more shortcuts