update to new CPLEX, other random changes