Many updates to basic switcher system