made lots of changes to plot cosmetics. WARNING: some plot names changed