improve join_table check... some other changes