Restructured soundSwitch

Also bufixes