More charts work.
Minor fixes.
Merge pull request #139 from mshamash/master

Charts work + fixes.