Fixes #258.
More chart tweaks.