join

wrapping up join changes