Fixed bug in empirical_controls and updated make_pairs