Various improvements to charts