some plotting changes
merging added plotting stuff