add match bracket pairs and a few other