add graph. fixes more isses