tweaks to switcher and adding new topic