Fixed recalculation of dataset values. Added function to update data values