todos fixed in basis_exp. Fixed WS-plot
merge