fixed switch
added brace matcher