first step to removing requirement for the fancy adict
minor refactoring and changes to plotting
changes to plotting