fixing factor handling & adding combine.sensitivity

Starting to update plots, etc. to use combined sensitivity object.