further clean up and plot test - ready for merge back in master