minor changes before EPICXAF merge
final commit before epicxaf merge