fix some issues with calories count, should be

working now..