More chart improvments
Merge pull request #44 from mistercrunch/chart_imp

More chart improvments