Fixed match for and improved redirect edges; small update to gv for showing conditional edges