add scenario support
revert the one-off plotting options
add util plots for now, may refactor later