Made CPLEX work
Minor changes