Join, bug fixes, misc