added brace matcher and very basic folding for comments