improve graphing functions, integrate matchup graph