Merge pull request #178 from ElementalAlchemist/last-minute-patches

Fix empty join parameters causing crash
Don't forget that channels are comma-separated