master #2 few improvements (still for single plot...)