Added join, some expresssions, some tweak.