added more flexibility when adding new graphs + moved match_param to goaltype