Join redesign + bug fixes