autojoin

cleaned up stuff a little bit