Fixed issue with chekcing of items, and fixed chart functionality