update plotting
merge
update plotting scripts
update plotting scripts