New Join menus, new SQL, cleanup, and some random other stuff