Lots of changes

Debugging do_match
Added main and calc_EER