fixed plotting
merge with dev