cleanup and started working on tabs to support rc-switches