Added draw chart pies, improved calories calculation