chart fixes
Model enhancements
lots of fixes