data changes and charts fixed