adapt figure generator to the r2 case
added some remarks