refactor, accordion output, sources, charts