Fix bugs and add dune::Graphics