join implemented; some small improvements