Update chart functions to work with new outputs.

Also fix bug from edit-mode refactor.