Changes for Issue #9 plus a whole bunch of chart cleanup