update charts, improve data handling, fix eighteen baskets bug