improves market charts
merge upstream develop