Updates to Chart Drawing

Fixes #4 #15 #28 #40