Add core, now joins channel (+2 minor bugfixes)