clean up charts, still not perfect