Some cleanup and more added to plot units as graph (c1077 and 198ba).