small changes
support for @join command