adding join logic, bug fixes, ui tweaks