Fix fast_match and make interface nicer
Transparent JJR and slightly more tests