tweaks to switcher and adding new topic
Merge pull request #1323 from pennij/working_mon0513

tweaks to switcher and adding new topic