Channel join/leave message fixes

This has been bugging me for a while and needed to be fixed. I just did it because I had nothing else to do.