Index: src/libchcore/TSubTaskStatsSnapshot.cpp
===================================================================
diff -u -N -rbe569bc86280887eeebb8d3e9489f6fc17c570e6 -r2a34de9ddfcfb4a1ed4c61ece641d37b91c23b6b
--- src/libchcore/TSubTaskStatsSnapshot.cpp	(.../TSubTaskStatsSnapshot.cpp)	(revision be569bc86280887eeebb8d3e9489f6fc17c570e6)
+++ src/libchcore/TSubTaskStatsSnapshot.cpp	(.../TSubTaskStatsSnapshot.cpp)	(revision 2a34de9ddfcfb4a1ed4c61ece641d37b91c23b6b)
@@ -25,6 +25,7 @@
 #include <boost/numeric/conversion/cast.hpp>
 #include "MathFunctions.h"
 #include "TBufferSizes.h"
+#include "EngineConstants.h"
 
 namespace chcore
 {
@@ -68,11 +69,11 @@
 
 	double TSubTaskStatsSnapshot::CalculateProgress() const
 	{
-		// we're treating each of the items as 512B object to process
+		// we're treating each of the items as 4k object to process
 		// to have some balance between items' count and items' size in
 		// progress information
-		unsigned long long ullProcessed = 512ULL * m_fcProcessedCount + m_ullProcessedSize;
-		unsigned long long ullTotal = 512ULL * m_fcTotalCount + m_ullTotalSize;
+		unsigned long long ullProcessed = AssumedFileMinDataSize * m_fcProcessedCount + m_ullProcessedSize;
+		unsigned long long ullTotal = AssumedFileMinDataSize * m_fcTotalCount + m_ullTotalSize;
 
 		if (ullTotal != 0)
 			return Math::Div64(ullProcessed, ullTotal);
@@ -94,11 +95,26 @@
 		m_dSizeSpeed = dSizeSpeed;
 	}
 
+	double TSubTaskStatsSnapshot::GetSizeSpeed() const
+	{
+		if(m_bSubTaskIsRunning)
+			return m_dSizeSpeed;
+
+		return 0.0;
+	}
+
 	void TSubTaskStatsSnapshot::SetCountSpeed(double dCountSpeed)
 	{
 		m_dCountSpeed = dCountSpeed;
 	}
 
+	double TSubTaskStatsSnapshot::GetCountSpeed() const
+	{
+		if(m_bSubTaskIsRunning)
+			return m_dCountSpeed;
+		return 0.0;
+	}
+
 	double TSubTaskStatsSnapshot::GetAvgSizeSpeed() const
 	{
 		if (m_timeElapsed)
@@ -111,8 +127,8 @@
 	{
 		if (m_timeElapsed)
 			return Math::Div64(m_fcProcessedCount, m_timeElapsed / 1000.0);
-		else
-			return 0.0;
+
+		return 0.0;
 	}
 
 	double TSubTaskStatsSnapshot::GetCombinedProgress() const