Remove that annoying double space on join.
some changes.