some switch syntax updates