fix join
fix joins
fix greedy matching