Correction to figures

Changed order in figures generation (to plot mode on one plot)
Corrections to figure generation
Update to figure generation routine
Correction to scatplot(.) routine

Only unique points [X,Y] are plotted in order to suppress warning
message from scatplot(.) routine.