General improvements. Better errorhandling. Fixing stuff like
join-channelerrors.
Merge remote-tracking branch 'origin/master'